From 9213d20487b9f5d3fb538cb16b95fd8118b024dc Mon Sep 17 00:00:00 2001 From: Matt Wilkinson Date: Sat, 24 Apr 2021 13:49:10 -0400 Subject: [PATCH] fmt --- library/std/src/io/mod.rs | 12 ++---------- library/test/src/lib.rs | 6 +----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs index f19381684a373..e97123574da42 100644 --- a/library/std/src/io/mod.rs +++ b/library/std/src/io/mod.rs @@ -2224,11 +2224,7 @@ impl Read for Chain { unsafe fn initializer(&self) -> Initializer { let initializer = self.first.initializer(); - if initializer.should_initialize() { - initializer - } else { - self.second.initializer() - } + if initializer.should_initialize() { initializer } else { self.second.initializer() } } } @@ -2247,11 +2243,7 @@ impl BufRead for Chain { } fn consume(&mut self, amt: usize) { - if !self.done_first { - self.first.consume(amt) - } else { - self.second.consume(amt) - } + if !self.done_first { self.first.consume(amt) } else { self.second.consume(amt) } } } diff --git a/library/test/src/lib.rs b/library/test/src/lib.rs index 7fff873528676..e838eb40a859e 100644 --- a/library/test/src/lib.rs +++ b/library/test/src/lib.rs @@ -292,11 +292,7 @@ where fn calc_timeout(timeout_queue: &VecDeque) -> Option { timeout_queue.front().map(|&TimeoutEntry { timeout: next_timeout, .. }| { let now = Instant::now(); - if next_timeout >= now { - next_timeout - now - } else { - Duration::new(0, 0) - } + if next_timeout >= now { next_timeout - now } else { Duration::new(0, 0) } }) }