From 8374c1702c1d9858d8906051cd531757be63998d Mon Sep 17 00:00:00 2001 From: Scott McMurray Date: Tue, 13 Oct 2020 07:58:22 -0700 Subject: [PATCH] Bump the version of rustfmt used in tidy To pick up https://github.com/rust-lang/rustfmt/pull/4461 So that rustfmt has the parsing fix from https://github.com/rust-lang/rust/pull/76274 ...and do a reformat that it wants. --- library/core/src/iter/adapters/mod.rs | 6 +----- src/stage0.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/library/core/src/iter/adapters/mod.rs b/library/core/src/iter/adapters/mod.rs index ba66ba2912f67..bf30dcb7689fa 100644 --- a/library/core/src/iter/adapters/mod.rs +++ b/library/core/src/iter/adapters/mod.rs @@ -2381,11 +2381,7 @@ where } let n = self.len(); - if n == 0 { - try { init } - } else { - self.iter.try_rfold(init, check(n, fold)).into_try() - } + if n == 0 { try { init } } else { self.iter.try_rfold(init, check(n, fold)).into_try() } } fn rfold(mut self, init: Acc, fold: Fold) -> Acc diff --git a/src/stage0.txt b/src/stage0.txt index 98b4dfa9c749b..d90adecab7866 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -20,7 +20,7 @@ cargo: beta # bootstrapping issues with use of new syntax in this repo. If you're looking at # the beta/stable branch, this key should be omitted, as we don't want to depend # on rustfmt from nightly there. -rustfmt: nightly-2020-10-07 +rustfmt: nightly-2020-10-12 # When making a stable release the process currently looks like: #