From 47905f98eef9c0ee5d64eb8c536c821e86f6c4cd Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Jan 2015 16:23:07 -0800
Subject: [PATCH] Add a missing stable attribute

---
 src/libstd/error.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 3754daf0b478..76942c901e1e 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;
 }