Skip to content

Commit d6953df

Browse files
committed
Auto merge of #74760 - tmandry:roll, r=tmandry
Update rustfmt and rls Closes #74080, #74081. rls changes: - deps: update racer and cargo rustfmt changes: - preparation for potential rustfmt 1.4.19 (#4283) - chore: backport 8157a3f0afe978d3e953420577f8344db7e905bf - deps: bump rustc-ap to v669 - deps: bump rustc-ap-* to v668 - deps: bump rustc-ap* to v666 - Use correct span for match arms with the leading pipe and attributes (#3975)
2 parents 8cb94fc + e193cb1 commit d6953df

File tree

3 files changed

+44
-43
lines changed

3 files changed

+44
-43
lines changed

Cargo.lock

+42-41
Original file line numberDiff line numberDiff line change
@@ -2415,9 +2415,9 @@ dependencies = [
24152415

24162416
[[package]]
24172417
name = "racer"
2418-
version = "2.1.35"
2418+
version = "2.1.36"
24192419
source = "registry+https://github.com/rust-lang/crates.io-index"
2420-
checksum = "421174f19211ba9e5fda34aa0cbc292188aae8e0cfbff4aebbae23f1a416bfb3"
2420+
checksum = "09ba6cca9fcd8ae086b842b1bd9e3f19f104a4c30e0e8927b2befc06d375e7e0"
24212421
dependencies = [
24222422
"bitflags",
24232423
"clap",
@@ -2811,19 +2811,19 @@ dependencies = [
28112811

28122812
[[package]]
28132813
name = "rustc-ap-rustc_arena"
2814-
version = "664.0.0"
2814+
version = "669.0.0"
28152815
source = "registry+https://github.com/rust-lang/crates.io-index"
2816-
checksum = "0c6683b49209f8b132bec33dc6b6c8f9958c8c94eb3586d4cb495e092b61c1da"
2816+
checksum = "c9cdd301e9dcb15ead384fc07196c850fd22829fae81d296b2ed6b4b10bf3278"
28172817
dependencies = [
28182818
"rustc-ap-rustc_data_structures",
28192819
"smallvec 1.4.0",
28202820
]
28212821

28222822
[[package]]
28232823
name = "rustc-ap-rustc_ast"
2824-
version = "664.0.0"
2824+
version = "669.0.0"
28252825
source = "registry+https://github.com/rust-lang/crates.io-index"
2826-
checksum = "5b21784d92fb2d584800f528866f00fe814f73abda794f406bfd1fbb2f1ca7f7"
2826+
checksum = "3f7c0d0537ca69dfe4a49212035295dfb37a235b5df01aa877d50b247f4775b8"
28272827
dependencies = [
28282828
"bitflags",
28292829
"log",
@@ -2839,9 +2839,9 @@ dependencies = [
28392839

28402840
[[package]]
28412841
name = "rustc-ap-rustc_ast_passes"
2842-
version = "664.0.0"
2842+
version = "669.0.0"
28432843
source = "registry+https://github.com/rust-lang/crates.io-index"
2844-
checksum = "820c46fde7ef1df0432073090d775f097b7279ca75ea34ba954081ce4b884d4c"
2844+
checksum = "d4cf4dca95f55f70eeb193fb08554026d79d0628de771fd726bb609e36887b82"
28452845
dependencies = [
28462846
"itertools 0.8.0",
28472847
"log",
@@ -2858,9 +2858,9 @@ dependencies = [
28582858

28592859
[[package]]
28602860
name = "rustc-ap-rustc_ast_pretty"
2861-
version = "664.0.0"
2861+
version = "669.0.0"
28622862
source = "registry+https://github.com/rust-lang/crates.io-index"
2863-
checksum = "013db7dd198fe95962d2cefa5bd0b350cf2028af77c169b17b4baa9c3bbf77d1"
2863+
checksum = "202bd2886d0cfa48baa3711042c14843f1b4852555b7ee7e5376bf66b276cb8d"
28642864
dependencies = [
28652865
"log",
28662866
"rustc-ap-rustc_ast",
@@ -2870,9 +2870,9 @@ dependencies = [
28702870

28712871
[[package]]
28722872
name = "rustc-ap-rustc_attr"
2873-
version = "664.0.0"
2873+
version = "669.0.0"
28742874
source = "registry+https://github.com/rust-lang/crates.io-index"
2875-
checksum = "35b5a85c90eb341eec543600ffdd9e262da5ea72a73a23ae4ca2f4ab8cd1a188"
2875+
checksum = "b11ee1d92b3214e8a8c7829eff84cc1b03925da0ea5c6900cefe05b99edb4682"
28762876
dependencies = [
28772877
"rustc-ap-rustc_ast",
28782878
"rustc-ap-rustc_ast_pretty",
@@ -2888,9 +2888,9 @@ dependencies = [
28882888

28892889
[[package]]
28902890
name = "rustc-ap-rustc_data_structures"
2891-
version = "664.0.0"
2891+
version = "669.0.0"
28922892
source = "registry+https://github.com/rust-lang/crates.io-index"
2893-
checksum = "b92e4c6cb6c43ee9031a71709dc12853b358253c2b41d12a26379994fab625e0"
2893+
checksum = "7a45d43b974d4cb9e32e5a15119c5eb7672c306ef09b064f2125b6a0399f6656"
28942894
dependencies = [
28952895
"bitflags",
28962896
"cfg-if",
@@ -2918,9 +2918,9 @@ dependencies = [
29182918

29192919
[[package]]
29202920
name = "rustc-ap-rustc_errors"
2921-
version = "664.0.0"
2921+
version = "669.0.0"
29222922
source = "registry+https://github.com/rust-lang/crates.io-index"
2923-
checksum = "6b0aa79423260c1b9e2f856e144e040f606b0f5d43644408375becf9d7bcdf86"
2923+
checksum = "8cd895d440820aaa04e6dc5486105494920a1e9779b9b051e8dba4ca5c182f94"
29242924
dependencies = [
29252925
"annotate-snippets 0.8.0",
29262926
"atty",
@@ -2936,9 +2936,9 @@ dependencies = [
29362936

29372937
[[package]]
29382938
name = "rustc-ap-rustc_expand"
2939-
version = "664.0.0"
2939+
version = "669.0.0"
29402940
source = "registry+https://github.com/rust-lang/crates.io-index"
2941-
checksum = "c07d76ba2a1b7d4325a2ed21d6345ccebd89ddc6666a1535a6edd489fb4cbc11"
2941+
checksum = "71a0cc7820860d6691bf0aa7a95cdbc60f6587b495c18e0fa15a888fdabbf171"
29422942
dependencies = [
29432943
"log",
29442944
"rustc-ap-rustc_ast",
@@ -2958,9 +2958,9 @@ dependencies = [
29582958

29592959
[[package]]
29602960
name = "rustc-ap-rustc_feature"
2961-
version = "664.0.0"
2961+
version = "669.0.0"
29622962
source = "registry+https://github.com/rust-lang/crates.io-index"
2963-
checksum = "1bbd625705c1db42a0c7503736292813d7b76ada5da20578fb55c63228c80ab5"
2963+
checksum = "5473d5106401aa46f881eb91772f0a41fd5f28ae6134cf4b450eb1370ea6af22"
29642964
dependencies = [
29652965
"lazy_static",
29662966
"rustc-ap-rustc_data_structures",
@@ -2969,40 +2969,40 @@ dependencies = [
29692969

29702970
[[package]]
29712971
name = "rustc-ap-rustc_fs_util"
2972-
version = "664.0.0"
2972+
version = "669.0.0"
29732973
source = "registry+https://github.com/rust-lang/crates.io-index"
2974-
checksum = "34cca6e2942fa0b059c582437ead666d5bcf20fa7c242599e2bbea9b609f29ae"
2974+
checksum = "8da1d57ee7a7ef55f31a97d99c7f919f02fc9a60ab96faa8cf45a7ae3ab1ccbf"
29752975

29762976
[[package]]
29772977
name = "rustc-ap-rustc_graphviz"
2978-
version = "664.0.0"
2978+
version = "669.0.0"
29792979
source = "registry+https://github.com/rust-lang/crates.io-index"
2980-
checksum = "13d6a029b81f5e02da85763f82c135507f278a4a0c776432c728520563059529"
2980+
checksum = "e3af62b20460908378cd1d354917acd9553376c5363bbb4e465f949bd82bdef9"
29812981

29822982
[[package]]
29832983
name = "rustc-ap-rustc_index"
2984-
version = "664.0.0"
2984+
version = "669.0.0"
29852985
source = "registry+https://github.com/rust-lang/crates.io-index"
2986-
checksum = "bae50852d303e230b2781c994513788136dc6c2fe4ebe032959f0b990a425767"
2986+
checksum = "3af7d4c456fe7647453d3fcd58335c9d512d1ff9a239a370b7ebdd353d69f66f"
29872987
dependencies = [
29882988
"rustc-ap-rustc_serialize",
29892989
"smallvec 1.4.0",
29902990
]
29912991

29922992
[[package]]
29932993
name = "rustc-ap-rustc_lexer"
2994-
version = "664.0.0"
2994+
version = "669.0.0"
29952995
source = "registry+https://github.com/rust-lang/crates.io-index"
2996-
checksum = "b7186e74aa2d31bf0e2454325fefcdf0a3da77d9344134592144b9e40d45b15d"
2996+
checksum = "456af5f09c006cf6c22c1a433ee0232c4bb74bdc6c647a010166a47c94ed2a63"
29972997
dependencies = [
29982998
"unicode-xid 0.2.0",
29992999
]
30003000

30013001
[[package]]
30023002
name = "rustc-ap-rustc_macros"
3003-
version = "664.0.0"
3003+
version = "669.0.0"
30043004
source = "registry+https://github.com/rust-lang/crates.io-index"
3005-
checksum = "4fc1add04e9d2301164118660ee0bc3266e9a7b1973fc2303fdbe002a12e5401"
3005+
checksum = "64f6acd192f313047759a346b892998b626466b93fe04f415da5f38906bb3b4c"
30063006
dependencies = [
30073007
"proc-macro2 1.0.3",
30083008
"quote 1.0.2",
@@ -3012,9 +3012,9 @@ dependencies = [
30123012

30133013
[[package]]
30143014
name = "rustc-ap-rustc_parse"
3015-
version = "664.0.0"
3015+
version = "669.0.0"
30163016
source = "registry+https://github.com/rust-lang/crates.io-index"
3017-
checksum = "9cd7fc4968bd60084f2fa4f280fa450b0cf98660a7983d6b93a7ae41b6d1d322"
3017+
checksum = "c006e8117c1c55e42bb56386c86ce6f7e4b47349e0bec7888c1d24784272e61b"
30183018
dependencies = [
30193019
"bitflags",
30203020
"log",
@@ -3031,20 +3031,21 @@ dependencies = [
30313031

30323032
[[package]]
30333033
name = "rustc-ap-rustc_serialize"
3034-
version = "664.0.0"
3034+
version = "669.0.0"
30353035
source = "registry+https://github.com/rust-lang/crates.io-index"
3036-
checksum = "00bf4c110271d9a2b7dfd2c6eb82e56fd80606a8bad6c102e158c54e44044046"
3036+
checksum = "306ced69beaeebe4de9552ee751eb54ea25b5f34a73fe80f5f9cbbe15ccebc48"
30373037
dependencies = [
30383038
"indexmap",
30393039
"smallvec 1.4.0",
30403040
]
30413041

30423042
[[package]]
30433043
name = "rustc-ap-rustc_session"
3044-
version = "664.0.0"
3044+
version = "669.0.0"
30453045
source = "registry+https://github.com/rust-lang/crates.io-index"
3046-
checksum = "431cf962de71d4c03fb877d54f331ec36eca77350b0539017abc40a4410d6501"
3046+
checksum = "dbff48435f5a476365e3ab5f49e07f98715cecb2d8c5bbcafeaf3aec638407be"
30473047
dependencies = [
3048+
"bitflags",
30483049
"getopts",
30493050
"log",
30503051
"num_cpus",
@@ -3060,9 +3061,9 @@ dependencies = [
30603061

30613062
[[package]]
30623063
name = "rustc-ap-rustc_span"
3063-
version = "664.0.0"
3064+
version = "669.0.0"
30643065
source = "registry+https://github.com/rust-lang/crates.io-index"
3065-
checksum = "b912039640597624f4bcb75f1e1fcfa5710267d715a7f73a6336baef341b23d1"
3066+
checksum = "ec4273af0abbe78fc4585316ab193445c848c555e9203ddc28af02330918bf30"
30663067
dependencies = [
30673068
"cfg-if",
30683069
"log",
@@ -3079,9 +3080,9 @@ dependencies = [
30793080

30803081
[[package]]
30813082
name = "rustc-ap-rustc_target"
3082-
version = "664.0.0"
3083+
version = "669.0.0"
30833084
source = "registry+https://github.com/rust-lang/crates.io-index"
3084-
checksum = "51347a9dadc5ad0b5916cc12d42624b31955285ad13745dbe72f0140038b84e9"
3085+
checksum = "6f9a2d6004ce6ad492a8eeacc2569b1c008169434b8828996d8dade4e5c6b6ee"
30853086
dependencies = [
30863087
"bitflags",
30873088
"log",
@@ -4085,7 +4086,7 @@ dependencies = [
40854086

40864087
[[package]]
40874088
name = "rustfmt-nightly"
4088-
version = "1.4.18"
4089+
version = "1.4.19"
40894090
dependencies = [
40904091
"annotate-snippets 0.6.1",
40914092
"anyhow",

src/tools/rls

0 commit comments

Comments
 (0)