Skip to content

Commit 8fb1180

Browse files
committed
Auto merge of #51739 - Amanieu:update_rustfmt, r=Mark-Simulacrum
Update rustfmt submodule The version of rustfmt currently shipped with nightly breaks code that uses `break 'label`. This PR updates the submodule to include the fix (rust-lang/rustfmt#2774).
2 parents 60efbde + c44be4c commit 8fb1180

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

src/Cargo.lock

+34-34
Original file line numberDiff line numberDiff line change
@@ -1813,10 +1813,10 @@ dependencies = [
18131813

18141814
[[package]]
18151815
name = "rustc-ap-arena"
1816-
version = "156.0.0"
1816+
version = "164.0.0"
18171817
source = "registry+https://github.com/rust-lang/crates.io-index"
18181818
dependencies = [
1819-
"rustc-ap-rustc_data_structures 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1819+
"rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18201820
]
18211821

18221822
[[package]]
@@ -1830,7 +1830,7 @@ dependencies = [
18301830

18311831
[[package]]
18321832
name = "rustc-ap-rustc_cratesio_shim"
1833-
version = "156.0.0"
1833+
version = "164.0.0"
18341834
source = "registry+https://github.com/rust-lang/crates.io-index"
18351835
dependencies = [
18361836
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1856,16 +1856,16 @@ dependencies = [
18561856

18571857
[[package]]
18581858
name = "rustc-ap-rustc_data_structures"
1859-
version = "156.0.0"
1859+
version = "164.0.0"
18601860
source = "registry+https://github.com/rust-lang/crates.io-index"
18611861
dependencies = [
18621862
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
18631863
"ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
18641864
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
18651865
"parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
18661866
"parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
1867-
"rustc-ap-rustc_cratesio_shim 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1868-
"rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1867+
"rustc-ap-rustc_cratesio_shim 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1868+
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18691869
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
18701870
"rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
18711871
"rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1887,13 +1887,13 @@ dependencies = [
18871887

18881888
[[package]]
18891889
name = "rustc-ap-rustc_errors"
1890-
version = "156.0.0"
1890+
version = "164.0.0"
18911891
source = "registry+https://github.com/rust-lang/crates.io-index"
18921892
dependencies = [
18931893
"atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
1894-
"rustc-ap-rustc_data_structures 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1895-
"rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1896-
"rustc-ap-syntax_pos 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1894+
"rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1895+
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1896+
"rustc-ap-syntax_pos 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18971897
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
18981898
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
18991899
]
@@ -1911,13 +1911,13 @@ dependencies = [
19111911

19121912
[[package]]
19131913
name = "rustc-ap-rustc_target"
1914-
version = "156.0.0"
1914+
version = "164.0.0"
19151915
source = "registry+https://github.com/rust-lang/crates.io-index"
19161916
dependencies = [
19171917
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
19181918
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
1919-
"rustc-ap-rustc_cratesio_shim 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1920-
"rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1919+
"rustc-ap-rustc_cratesio_shim 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1920+
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19211921
]
19221922

19231923
[[package]]
@@ -1927,7 +1927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
19271927

19281928
[[package]]
19291929
name = "rustc-ap-serialize"
1930-
version = "156.0.0"
1930+
version = "164.0.0"
19311931
source = "registry+https://github.com/rust-lang/crates.io-index"
19321932

19331933
[[package]]
@@ -1947,16 +1947,16 @@ dependencies = [
19471947

19481948
[[package]]
19491949
name = "rustc-ap-syntax"
1950-
version = "156.0.0"
1950+
version = "164.0.0"
19511951
source = "registry+https://github.com/rust-lang/crates.io-index"
19521952
dependencies = [
19531953
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
19541954
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
1955-
"rustc-ap-rustc_data_structures 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1956-
"rustc-ap-rustc_errors 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1957-
"rustc-ap-rustc_target 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1958-
"rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1959-
"rustc-ap-syntax_pos 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1955+
"rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1956+
"rustc-ap-rustc_errors 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1957+
"rustc-ap-rustc_target 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1958+
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1959+
"rustc-ap-syntax_pos 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19601960
"scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
19611961
]
19621962

@@ -1974,12 +1974,12 @@ dependencies = [
19741974

19751975
[[package]]
19761976
name = "rustc-ap-syntax_pos"
1977-
version = "156.0.0"
1977+
version = "164.0.0"
19781978
source = "registry+https://github.com/rust-lang/crates.io-index"
19791979
dependencies = [
1980-
"rustc-ap-arena 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1981-
"rustc-ap-rustc_data_structures 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1982-
"rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1980+
"rustc-ap-arena 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1981+
"rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1982+
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19831983
"scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
19841984
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
19851985
]
@@ -2494,8 +2494,8 @@ dependencies = [
24942494
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
24952495
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
24962496
"regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2497-
"rustc-ap-rustc_target 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2498-
"rustc-ap-syntax 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2497+
"rustc-ap-rustc_target 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2498+
"rustc-ap-syntax 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
24992499
"serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
25002500
"serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
25012501
"serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3317,21 +3317,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33173317
"checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"
33183318
"checksum rls-vfs 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "be231e1e559c315bc60ced5ad2cc2d7a9c208ed7d4e2c126500149836fda19bb"
33193319
"checksum rustc-ap-arena 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e794b25832224eea9252ebfa9f94ab7070d0a60c977793112c611501cb56b48d"
3320-
"checksum rustc-ap-arena 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83e91a01cd6c5a9e4f68c2b5c81b62b172aa9e00fc2fec862c0899e3fac1fd32"
3320+
"checksum rustc-ap-arena 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f0687e373d86505f31faeaee87d2be552843a830a0a20e252e76337b9596161"
33213321
"checksum rustc-ap-rustc_cratesio_shim 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a78241b2ecb82ebb9221b4b7d37c024ff1f2e43f1b099f38a997f030fc7894b0"
3322-
"checksum rustc-ap-rustc_cratesio_shim 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e8ea8fadc5d66c1527771816e83f7e7599543bd2e1583e279855370ab2f18e5"
3322+
"checksum rustc-ap-rustc_cratesio_shim 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ab5b83e209f3bcdb3c058a996d54b67db58eed5496bd114a781d9faa021aba7"
33233323
"checksum rustc-ap-rustc_data_structures 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5529c3927f32b0b56d1f6449a34f2218dc2160c6a6dde0cf47954d83a9a45764"
3324-
"checksum rustc-ap-rustc_data_structures 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "742ba74bc7d0f3ded56148329650f137fa5b90f7f0ecc4b4952150f32c66b147"
3324+
"checksum rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4bb330c149e9b133d4707718a7981d65ce4eb14f2d59cb487761aa922fefb206"
33253325
"checksum rustc-ap-rustc_errors 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1fef44a7d63f5d204c981adb26a14e85fe7ee5962050a4f664df6f425f9b48"
3326-
"checksum rustc-ap-rustc_errors 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3714046c6f8c1c259822aefcca21b1862710a6cec24fd34c0796117f074c6769"
3326+
"checksum rustc-ap-rustc_errors 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e19ae6a813d5cdd12b8b95cea71438bf8a5fa3505bea1e7d68d438a8ac5ae7b"
33273327
"checksum rustc-ap-rustc_target 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a3939a9f7bf063536dd646894ca43b1378ec6a56ac5b2698cc6ba0b42bfadbdc"
3328-
"checksum rustc-ap-rustc_target 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b982c4517c18080895b06149ce8aa8279fd013f629030bb7a179bfcff6d74ef2"
3328+
"checksum rustc-ap-rustc_target 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867d4a6bc1b62d373fc6ec72632d5cbd36f3cb1f4e51282d0c7b4e771b393031"
33293329
"checksum rustc-ap-serialize 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "692169d0bac8a4547f9778039460799e162664477a1eaec15d31507705f8c736"
3330-
"checksum rustc-ap-serialize 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "27c7700595bff1a64ddb6f593c69db3f6d66b76b059b26137236c7e21e36db70"
3330+
"checksum rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e095f23598f115432ffef263201e030626f454d183cf425ef68fcca984f6594b"
33313331
"checksum rustc-ap-syntax 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22e93ee3817b007d56b5c5b151e6cd7c7063455a1facaf9e0ca01f9d9365b716"
3332-
"checksum rustc-ap-syntax 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6482d98c8be57d3cfe55dab744dd1a87f8462dc2ea0a8a4960f7bb1565be049"
3332+
"checksum rustc-ap-syntax 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab8f97532dabc3713ac3e8d11a85f1a5b154486e79a0c2643d62078f0f948ce2"
33333333
"checksum rustc-ap-syntax_pos 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe5d24a137d6e202cd6eb96cb74f8cb4a2b257c42b74dd624e136b4e19f0a47d"
3334-
"checksum rustc-ap-syntax_pos 156.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "20af5e200b61a3e5ba4f58ed3cbd7593569faf8f0956d5233f4f27fee51b4c81"
3334+
"checksum rustc-ap-syntax_pos 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e098adae207a4b8d470bc5e9565904cfe65dca799ba4c9efc872e7436eb5a67"
33353335
"checksum rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb"
33363336
"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
33373337
"checksum rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c6d5a683c6ba4ed37959097e88d71c9e8e26659a3cb5be8b389078e7ad45306"

src/tools/rustfmt

0 commit comments

Comments
 (0)