about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2015-01-22 16:23:07 -0800
committerBrian Anderson <banderson@mozilla.com>2015-01-22 16:23:07 -0800
commit47905f98eef9c0ee5d64eb8c536c821e86f6c4cd (patch)
tree9f68b7aed0a679e5e6f4eaafc8858611753d6478 /src/libstd
parentd3c0bb416e78cb878182dc6f4fd4a09922db87c1 (diff)
downloadrust-47905f98eef9c0ee5d64eb8c536c821e86f6c4cd.tar.gz
rust-47905f98eef9c0ee5d64eb8c536c821e86f6c4cd.zip
Add a missing stable attribute
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/error.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 3754daf0b47..76942c901e1 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -103,6 +103,7 @@ pub trait Error {
 #[stable(feature = "grandfathered", since = "1.0.0")]
 pub trait FromError<E> {
     /// Perform the conversion.
+    #[stable(feature = "grandfathered", since = "1.0.0")]
     fn from_error(err: E) -> Self;
 }