---

brson · brson · commit c721b2d3ecf8 · 2015-01-22T16:23:07.000-08:00
yaml --- r: 175821 b: refs/heads/auto c: 47905f9 h: refs/heads/master i: 175819: 8c1538e v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d3c0bb416e78cb878182dc6f4fd4a09922db87c1
+refs/heads/auto: 47905f98eef9c0ee5d64eb8c536c821e86f6c4cd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libstd/error.rs b/branches/auto/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`