---

brson · brson · commit b8d3f3ec4676 · 2015-01-22T16:23:07.000-08:00
yaml --- r: 182803 b: refs/heads/beta c: 47905f9 h: refs/heads/master i: 182801: d7ed755 182799: 1453e62 v: v3
diff --git a/[refs] b/[refs]
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: d3c0bb416e78cb878182dc6f4fd4a09922db87c1
+refs/heads/beta: 47905f98eef9c0ee5d64eb8c536c821e86f6c4cd
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f
diff --git a/branches/beta/src/libstd/error.rs b/branches/beta/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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ pub trait Error {`
`103`	`103`	`#[stable(feature = "grandfathered", since = "1.0.0")]`
`104`	`104`	`pub trait FromError<E> {`
`105`	`105`	`/// Perform the conversion.`
	`106`	`+ #[stable(feature = "grandfathered", since = "1.0.0")]`
`106`	`107`	`fn from_error(err: E) -> Self;`
`107`	`108`	`}`
`108`	`109`