diff options
| author | bors <bors@rust-lang.org> | 2017-05-20 15:42:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-20 15:42:43 +0000 |
| commit | 272e77f035d8cca43f228764c2028c09eeaca20e (patch) | |
| tree | 932ee7567e61ac15d0baf67711de254894b56481 /src/libstd/error.rs | |
| parent | a0da1e0653e7a927dbf80f979306a7f31bc595b8 (diff) | |
| parent | 2f703e4304c1c9b15c616b7a08bac581af5ab430 (diff) | |
| download | rust-272e77f035d8cca43f228764c2028c09eeaca20e.tar.gz rust-272e77f035d8cca43f228764c2028c09eeaca20e.zip | |
Auto merge of #42111 - ollie27:stab, r=Mark-Simulacrum
Correct some stability versions These were found by running tidy on stable versions of rust and finding features stabilised with the wrong version numbers.
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 9ff7d746733..f56e3a5d780 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -193,7 +193,7 @@ impl From<String> for Box<Error + Send + Sync> { } } -#[stable(feature = "string_box_error", since = "1.7.0")] +#[stable(feature = "string_box_error", since = "1.6.0")] impl From<String> for Box<Error> { fn from(str_err: String) -> Box<Error> { let err1: Box<Error + Send + Sync> = From::from(str_err); @@ -209,7 +209,7 @@ impl<'a, 'b> From<&'b str> for Box<Error + Send + Sync + 'a> { } } -#[stable(feature = "string_box_error", since = "1.7.0")] +#[stable(feature = "string_box_error", since = "1.6.0")] impl<'a> From<&'a str> for Box<Error> { fn from(err: &'a str) -> Box<Error> { From::from(String::from(err)) @@ -282,7 +282,7 @@ impl Error for char::DecodeUtf16Error { } } -#[stable(feature = "box_error", since = "1.7.0")] +#[stable(feature = "box_error", since = "1.8.0")] impl<T: Error> Error for Box<T> { fn description(&self) -> &str { Error::description(&**self) |