diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-17 15:52:01 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-17 17:33:20 +0530 |
| commit | bf52f2eef578e6fff83611a6276a3aa9f284e1c5 (patch) | |
| tree | b8dbe9baff53cc9def4e2a78fdd9d8b96a585a30 /src/libstd/io | |
| parent | 4647d89205992383f8122e8fde0e2615497572bc (diff) | |
| parent | bc9084b9b7f21140ffbc051ecb2a0cd08e88f3bb (diff) | |
| download | rust-bf52f2eef578e6fff83611a6276a3aa9f284e1c5.tar.gz rust-bf52f2eef578e6fff83611a6276a3aa9f284e1c5.zip | |
Rollup merge of #22311 - lfairy:consistent-fmt, r=alexcrichton
This brings it in line with its namesake in `std::io`. [breaking-change] r? @aturon
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 1243df2f93e..c38d52161c9 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -381,14 +381,14 @@ pub trait Write { /// /// This function will return any I/O error reported while formatting. fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<()> { - // Create a shim which translates a Writer to a fmt::Writer and saves + // Create a shim which translates a Write to a fmt::Write and saves // off I/O errors. instead of discarding them struct Adaptor<'a, T: ?Sized + 'a> { inner: &'a mut T, error: Result<()>, } - impl<'a, T: Write + ?Sized> fmt::Writer for Adaptor<'a, T> { + impl<'a, T: Write + ?Sized> fmt::Write for Adaptor<'a, T> { fn write_str(&mut self, s: &str) -> fmt::Result { match self.inner.write_all(s.as_bytes()) { Ok(()) => Ok(()), |
