Auto merge of #80249 - calebcartwright:update-rustfmt, r=Mark-Simulacrum

update rustfmt to v1.4.30

Contains fixes for a few reported bugs on current nightly (1.4.29)

Notes in: https://github.com/rust-lang/rustfmt/releases/tag/v1.4.30

diff --git a/Cargo.lock b/Cargo.lock
index fcfd23f2dae5f4c3739d6878b64a9c7c092614aa..596a9413e1d1b54c573a5151678cfa6d75f29523 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4396,7 +4396,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.29"
+version = "1.4.30"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",
@@ -5342,7 +5342,7 @@ dependencies = [
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.11.0",
+ "parking_lot 0.9.0",
  "regex",
  "serde",
  "serde_json",

diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index 70ce18255f429caf0d75ecfed8c1464535ee779b..acd94866fd0ff5eacb7e184ae21c19e5440fc5fb 160000 (submodule)
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 70ce18255f429caf0d75ecfed8c1464535ee779b
+Subproject commit acd94866fd0ff5eacb7e184ae21c19e5440fc5fb