diff --git a/ctru-sys/src/lib.rs b/ctru-sys/src/lib.rs index b3cbfcb..d3cb2f3 100644 --- a/ctru-sys/src/lib.rs +++ b/ctru-sys/src/lib.rs @@ -6,7 +6,6 @@ */ #![no_std] -#![feature(question_mark)] #![allow(non_camel_case_types, non_snake_case, overflowing_literals)] pub mod console; diff --git a/src/error.rs b/src/error.rs index e7158b4..b5aef1e 100644 --- a/src/error.rs +++ b/src/error.rs @@ -53,7 +53,6 @@ use core::any::TypeId; use core::cell; use rustc_unicode::char; use core::fmt::{self, Debug, Display}; -use core::marker::Reflect; use core::mem::transmute; use core::num; use core::str; @@ -61,7 +60,7 @@ use collections::string::{self, String}; use alloc::boxed::Box; /// Base functionality for all errors in Rust. -pub trait Error: Debug + Display + Reflect { +pub trait Error: Debug + Display { /// A short description of the error. /// /// The description should not contain newlines or sentence-ending diff --git a/src/io/buffered.rs b/src/io/buffered.rs index b9cef35..13ddddb 100644 --- a/src/io/buffered.rs +++ b/src/io/buffered.rs @@ -12,7 +12,6 @@ use io::prelude::*; -use core::marker::Reflect; use core::cmp; use error; use core::fmt; @@ -557,7 +556,7 @@ impl From> for Error { fn from(iie: IntoInnerError) -> Error { iie.1 } } -impl error::Error for IntoInnerError { +impl error::Error for IntoInnerError { fn description(&self) -> &str { error::Error::description(self.error()) } diff --git a/src/lib.rs b/src/lib.rs index 6e15d82..e02b538 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,8 +3,6 @@ #![feature(char_escape_debug)] #![feature(int_error_internals)] #![feature(lang_items)] -#![feature(question_mark)] -#![feature(reflect_marker)] #![feature(slice_patterns)] #![feature(str_internals)] #![feature(try_from)]