Auto merge of #26285 - rick68:patch-3, r=alexcrichton

`FormatError` is not exist anymore.
This commit is contained in:
bors 2015-06-14 04:21:47 +00:00
commit 043f93f278

View File

@ -72,7 +72,7 @@ pub trait Write {
/// ///
/// # Errors /// # Errors
/// ///
/// This function will return an instance of `FormatError` on error. /// This function will return an instance of `Error` on error.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
fn write_str(&mut self, s: &str) -> Result; fn write_str(&mut self, s: &str) -> Result;
@ -85,7 +85,7 @@ pub trait Write {
/// ///
/// # Errors /// # Errors
/// ///
/// This function will return an instance of `FormatError` on error. /// This function will return an instance of `Error` on error.
#[stable(feature = "fmt_write_char", since = "1.1.0")] #[stable(feature = "fmt_write_char", since = "1.1.0")]
fn write_char(&mut self, c: char) -> Result { fn write_char(&mut self, c: char) -> Result {
let mut utf_8 = [0u8; 4]; let mut utf_8 = [0u8; 4];