Rollup merge of rust-lang#33856 - GuillaumeGomez:fmt_error, r=alexcrichton

Manishearth · Manishearth · commit fe9a91589ec5 · 2016-05-28T19:52:16.000+05:30
Implement Error trait for fmt::Error type Fixes rust-lang#33827. r? @alexcrichton Just one last thing: I added a feature name, but don't hesitate to ask me to change it if you think it doesn't fit well.
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
@@ -212,6 +212,13 @@ impl<T: Error> Error for Box<T> {
     }
 }
 
+#[stable(feature = "fmt_error", since = "1.11.0")]
+impl Error for fmt::Error {
+    fn description(&self) -> &str {
+        "an error occurred when formatting an argument"
+    }
+}
+
 // copied from any.rs
 impl Error + 'static {
     /// Returns true if the boxed type is the same as `T`

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,13 @@ impl<T: Error> Error for Box<T> {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
	`215`	`+#[stable(feature = "fmt_error", since = "1.11.0")]`
	`216`	`+impl Error for fmt::Error {`
	`217`	`+ fn description(&self) -> &str {`
	`218`	`+ "an error occurred when formatting an argument"`
	`219`	`+ }`
	`220`	`+}`
	`221`	`+`
`215`	`222`	`// copied from any.rs`
`216`	`223`	`impl Error + 'static {`
`217`	`224`	/// Returns true if the boxed type is the same as `T`