diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-23 21:48:20 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-23 21:48:20 -0800 |
| commit | b44ee371b8beea77aa1364460acbba14a8516559 (patch) | |
| tree | 92f5140fe5a2e5e364a4298651bf3c6bdf0f0940 /src/libstd/error.rs | |
| parent | b7fe2c54b7d638e38fcbe3284ff6295f2df6c928 (diff) | |
| download | rust-b44ee371b8beea77aa1364460acbba14a8516559.tar.gz rust-b44ee371b8beea77aa1364460acbba14a8516559.zip | |
grandfathered -> rust1
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index df949ab03aa..68ad3193e74 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -78,7 +78,7 @@ //! } //! ``` -#![stable(feature = "grandfathered", since = "1.0.0")] +#![stable(feature = "rust1", since = "1.0.0")] use prelude::v1::*; @@ -100,22 +100,22 @@ pub trait Error { } /// A trait for types that can be converted from a given error type `E`. -#[stable(feature = "grandfathered", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] pub trait FromError<E> { /// Perform the conversion. - #[stable(feature = "grandfathered", since = "1.0.0")] + #[stable(feature = "rust1", since = "1.0.0")] fn from_error(err: E) -> Self; } // Any type is convertable from itself -#[stable(feature = "grandfathered", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] impl<E> FromError<E> for E { fn from_error(err: E) -> E { err } } -#[stable(feature = "grandfathered", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] impl Error for Utf8Error { fn description(&self) -> &str { match *self { @@ -127,13 +127,13 @@ impl Error for Utf8Error { fn detail(&self) -> Option<String> { Some(self.to_string()) } } -#[stable(feature = "grandfathered", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] impl Error for FromUtf8Error { fn description(&self) -> &str { "invalid utf-8" } fn detail(&self) -> Option<String> { Some(self.to_string()) } } -#[stable(feature = "grandfathered", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] impl Error for FromUtf16Error { fn description(&self) -> &str { "invalid utf-16" } } |
