diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
| commit | afaf33dcafe9c7068b63eb997df221aa08db7c29 (patch) | |
| tree | 2bd2416c2a6dcbdf410e6d9f932960b124cb576a /library/std/src/io/mod.rs | |
| parent | 101003881418d23fee3fcb1b1721a216a366f2da (diff) | |
| parent | 1ad7c52812b336c23d86bc4c74c408fe5c850761 (diff) | |
| download | rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.tar.gz rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.zip | |
Auto merge of #83573 - JohnTitor:rollup-28jnzsr, r=JohnTitor
Rollup of 10 pull requests
Successful merges:
- #79399 (Use detailed and shorter fs error explaination)
- #83348 (format macro argument parsing fix)
- #83462 (ExitStatus: print "exit status: {}" rather than "exit code: {}" on unix)
- #83526 (lazily calls some fns)
- #83558 (Use DebugStruct::finish_non_exhaustive() in std.)
- #83559 (Fix Debug implementation for RwLock{Read,Write}Guard.)
- #83560 (Derive Debug for io::Chain instead of manually implementing it.)
- #83561 (Improve Debug implementations of Mutex and RwLock.)
- #83567 (Update rustup cross-compilation docs link)
- #83569 (Add regression tests for #56445)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/io/mod.rs')
| -rw-r--r-- | library/std/src/io/mod.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs index 5316305a303..9953bcd556d 100644 --- a/library/std/src/io/mod.rs +++ b/library/std/src/io/mod.rs @@ -2114,6 +2114,7 @@ pub trait BufRead: Read { /// /// [`chain`]: Read::chain #[stable(feature = "rust1", since = "1.0.0")] +#[derive(Debug)] pub struct Chain<T, U> { first: T, second: U, @@ -2195,13 +2196,6 @@ impl<T, U> Chain<T, U> { } } -#[stable(feature = "std_debug", since = "1.16.0")] -impl<T: fmt::Debug, U: fmt::Debug> fmt::Debug for Chain<T, U> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.debug_struct("Chain").field("t", &self.first).field("u", &self.second).finish() - } -} - #[stable(feature = "rust1", since = "1.0.0")] impl<T: Read, U: Read> Read for Chain<T, U> { fn read(&mut self, buf: &mut [u8]) -> Result<usize> { |