diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-14 17:49:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-14 17:49:24 +0200 |
| commit | 271eb8fc5a420280937bb1745f1e7aee7901ad26 (patch) | |
| tree | 873fa2736d652834cdab4d1077ccbe439f43f2a5 /src/libstd | |
| parent | fd4a3362ca607f1c3cfaf2b0c8f1c7dfdb808105 (diff) | |
| parent | ac5e755164be38d6485e3ceb80d472147a0d9552 (diff) | |
| download | rust-271eb8fc5a420280937bb1745f1e7aee7901ad26.tar.gz rust-271eb8fc5a420280937bb1745f1e7aee7901ad26.zip | |
Rollup merge of #59906 - czipperz:bufwriter-use-getmut, r=kennytm
Make BufWriter use get_mut instead of manipulating inner in Write implementation `get_mut` allows us to abstract over the implementation detail of inner being optional.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/buffered.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 3370a447fcc..bf406bb9b0b 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -601,7 +601,7 @@ impl<W: Write> Write for BufWriter<W> { } if buf.len() >= self.buf.capacity() { self.panicked = true; - let r = self.inner.as_mut().unwrap().write(buf); + let r = self.get_mut().write(buf); self.panicked = false; r } else { @@ -616,7 +616,7 @@ impl<W: Write> Write for BufWriter<W> { } if total_len >= self.buf.capacity() { self.panicked = true; - let r = self.inner.as_mut().unwrap().write_vectored(bufs); + let r = self.get_mut().write_vectored(bufs); self.panicked = false; r } else { |