Browse Source

Fix deprecation and stablization warnings

The question mark feature was stablized and the Reflect marker trait was deprecated
pull/10/head
Fenrir 8 years ago
parent
commit
1a4c4915d5
  1. 1
      ctru-sys/src/lib.rs
  2. 3
      src/error.rs
  3. 3
      src/io/buffered.rs
  4. 2
      src/lib.rs

1
ctru-sys/src/lib.rs

@ -6,7 +6,6 @@
*/ */
#![no_std] #![no_std]
#![feature(question_mark)]
#![allow(non_camel_case_types, non_snake_case, overflowing_literals)] #![allow(non_camel_case_types, non_snake_case, overflowing_literals)]
pub mod console; pub mod console;

3
src/error.rs

@ -53,7 +53,6 @@ use core::any::TypeId;
use core::cell; use core::cell;
use rustc_unicode::char; use rustc_unicode::char;
use core::fmt::{self, Debug, Display}; use core::fmt::{self, Debug, Display};
use core::marker::Reflect;
use core::mem::transmute; use core::mem::transmute;
use core::num; use core::num;
use core::str; use core::str;
@ -61,7 +60,7 @@ use collections::string::{self, String};
use alloc::boxed::Box; use alloc::boxed::Box;
/// Base functionality for all errors in Rust. /// Base functionality for all errors in Rust.
pub trait Error: Debug + Display + Reflect { pub trait Error: Debug + Display {
/// A short description of the error. /// A short description of the error.
/// ///
/// The description should not contain newlines or sentence-ending /// The description should not contain newlines or sentence-ending

3
src/io/buffered.rs

@ -12,7 +12,6 @@
use io::prelude::*; use io::prelude::*;
use core::marker::Reflect;
use core::cmp; use core::cmp;
use error; use error;
use core::fmt; use core::fmt;
@ -557,7 +556,7 @@ impl<W> From<IntoInnerError<W>> for Error {
fn from(iie: IntoInnerError<W>) -> Error { iie.1 } fn from(iie: IntoInnerError<W>) -> Error { iie.1 }
} }
impl<W: Reflect + Send + fmt::Debug> error::Error for IntoInnerError<W> { impl<W: Send + fmt::Debug> error::Error for IntoInnerError<W> {
fn description(&self) -> &str { fn description(&self) -> &str {
error::Error::description(self.error()) error::Error::description(self.error())
} }

2
src/lib.rs

@ -3,8 +3,6 @@
#![feature(char_escape_debug)] #![feature(char_escape_debug)]
#![feature(int_error_internals)] #![feature(int_error_internals)]
#![feature(lang_items)] #![feature(lang_items)]
#![feature(question_mark)]
#![feature(reflect_marker)]
#![feature(slice_patterns)] #![feature(slice_patterns)]
#![feature(str_internals)] #![feature(str_internals)]
#![feature(try_from)] #![feature(try_from)]

Loading…
Cancel
Save