Rollup merge of rust-lang#78970 - calebcartwright:update-rustfmt, r=A…

…aron1011 update rustfmt to v1.4.25 Contains changes from rust-lang/rustfmt#4507 r? `@Aaron1011`
m-ou-se · Nov 12, 2020 · 42a6a43 · 42a6a43
2 parents d3a7a5d + cd314ae
commit 42a6a43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -4329,7 +4329,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.24"
+version = "1.4.25"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",

diff --git a/src/tools/rustfmt b/src/tools/rustfmt