about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-04-19 21:55:39 -0400
committerGitHub <noreply@github.com>2017-04-19 21:55:39 -0400
commit16710bea14c017617f20ddf4e69c717de0e2ab34 (patch)
treec55b047cd2ae8836ae94681cccb0af1ce85960a7 /src/libstd
parent5eab9ba471d981b58b882a6bde79c6feeee968e1 (diff)
parentfd325a1b485b1698f86e791a5586cda79e64fdbd (diff)
downloadrust-16710bea14c017617f20ddf4e69c717de0e2ab34.tar.gz
rust-16710bea14c017617f20ddf4e69c717de0e2ab34.zip
Rollup merge of #41380 - ollie27:stability, r=BurntSushi
Fix a few stability attributes

These show up in rustdoc so need to be correct.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/error.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 3d80120f6b2..9ff7d746733 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -216,7 +216,7 @@ impl<'a> From<&'a str> for Box<Error> {
     }
 }
 
-#[stable(feature = "never_error", since = "1.18.0")]
+#[unstable(feature = "never_type_impls", issue = "35121")]
 impl Error for ! {
     fn description(&self) -> &str { *self }
 }