about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-01-16 23:15:35 +0000
committerbors <bors@rust-lang.org>2021-01-16 23:15:35 +0000
commit2e46cb38f174a4112fcfeecf6d4235f18830552f (patch)
treeb6132c9efc34059396ca3a7c7d90ddf377971f38
parent8a6518427e11e6dd13d6f39663b82eb4f810ca05 (diff)
parent13d77a37724d29688153e18cb0accde96f59c2f4 (diff)
downloadrust-2e46cb38f174a4112fcfeecf6d4235f18830552f.tar.gz
rust-2e46cb38f174a4112fcfeecf6d4235f18830552f.zip
Auto merge of #81093 - calebcartwright:update-rustfmt, r=Mark-Simulacrum
bump rustfmt to v1.4.32

Fixes an indentation bug with bounds reported in https://github.com/rust-lang/rust/pull/80843#discussion_r554476529

r? `@Mark-Simulacrum`
-rw-r--r--Cargo.lock2
m---------src/tools/rustfmt10
2 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 5e5a48ad525..c2c06a2adb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4400,7 +4400,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.31"
+version = "1.4.32"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 4f9c794ce1e3c77698f522c3eb1ab935f23df30
+Subproject 216a64300563351cad20bb3847110c14561687e