diff options
| author | bors <bors@rust-lang.org> | 2019-04-14 17:00:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-14 17:00:16 +0000 |
| commit | 9cd61f025b1b92076e69a9ef2d9233325c7d8bdc (patch) | |
| tree | e06ea1657bc17ae3d7b1ba86bc75013ec0984193 /src/libstd | |
| parent | d70c5a912edbeca55a84e4185e8fe22918aef8dc (diff) | |
| parent | c348bb69d6a7195cc01ce2bcb935e3b6293a2d74 (diff) | |
| download | rust-9cd61f025b1b92076e69a9ef2d9233325c7d8bdc.tar.gz rust-9cd61f025b1b92076e69a9ef2d9233325c7d8bdc.zip | |
Auto merge of #59967 - Centril:rollup-bdqq7ux, r=Centril
Rollup of 7 pull requests Successful merges: - #59856 (update polonius-engine) - #59877 (HirIdify hir::Def) - #59896 (Remove duplicated redundant spans) - #59900 (Remove [mut] syntax in pin docs) - #59906 (Make BufWriter use get_mut instead of manipulating inner in Write implementation) - #59936 (Fix cross-crate visibility of fictive variant constructors) - #59957 (Add missing backtick to Symbol documentation.) Failed merges: r? @ghost
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 { |
