diff options
| author | Fenrir <[email protected]> | 2016-10-15 00:26:26 -0700 |
|---|---|---|
| committer | Fenrir <[email protected]> | 2016-10-15 00:26:40 -0700 |
| commit | 1a4c4915d5d9bb608096b0b7287fd8742375bcf6 (patch) | |
| tree | f0a057a0ea5a89c24302b915b6232cced8edc832 /src | |
| parent | Remove libc OS error functions (diff) | |
| download | ctru-rs-1a4c4915d5d9bb608096b0b7287fd8742375bcf6.tar.xz ctru-rs-1a4c4915d5d9bb608096b0b7287fd8742375bcf6.zip | |
Fix deprecation and stablization warnings
The question mark feature was stablized and the Reflect marker trait was deprecated
Diffstat (limited to 'src')
| -rw-r--r-- | src/error.rs | 3 | ||||
| -rw-r--r-- | src/io/buffered.rs | 3 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
3 files changed, 2 insertions, 6 deletions
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<W> From<IntoInnerError<W>> for Error { 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 { error::Error::description(self.error()) } @@ -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)] |