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

m-ou-se · web-flow · commit a2e8fb540dec · 2020-11-12T19:46:16.000+01:00
update rustfmt to v1.4.25 Contains changes from rust-lang/rustfmt#4507 r? ``@Aaron1011``
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
@@ -1 +1 @@
-Subproject commit eb894d53708122a67762de9489881c11aa8ce257
+Subproject commit 0f29ff6da0c5ff622e739beb8fc3bbe77119b3c1
