about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-31 01:35:10 +0000
committerbors <bors@rust-lang.org>2019-08-31 01:35:10 +0000
commit2d851b33181b1404856cb1d8b20d261adda54ffb (patch)
tree427c6de30668f26cd98502756a28d74d4221daec
parentfd68d023f4011fea1c988a2b82801d09a5ad8bdf (diff)
parent8e10725317f9d55f41a881cfadd8cfa2e3f8c59e (diff)
Auto merge of #63975 - topecongiro:rustfmt-1.4.6, r=nikomatsakis
Update rustfmt to 1.4.6

This PR updates rustfmt to 1.4.6. [CHANGELOG](https://github.com/rust-lang/rustfmt/blob/v1.4.6/CHANGELOG.md#146-2019-08-28).
-rw-r--r--Cargo.lock2
m---------src/tools/rustfmt27
2 files changed, 22 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ae641d6ae32..e0d30647809 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3579,7 +3579,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.5"
+version = "1.4.6"
 dependencies = [
  "annotate-snippets",
  "atty",
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 9792ff05297c0a5c40942b346c9b0341b9e7c0e
+Subproject f800ce47d1da2a1c02ffd260deca8b7445f7fac