Skip to content

Commit 6951c31

Browse files
authored
Rollup merge of #77590 - Xanewok:update-rls, r=dtolnay
Update RLS and Rustfmt refs: rust-lang/rls#1701 cc @calebcartwright r? @dtolnay
2 parents 6b4dbb1 + 1b9c45b commit 6951c31

File tree

3 files changed

+45
-47
lines changed

3 files changed

+45
-47
lines changed

Cargo.lock

+43-45
Original file line numberDiff line numberDiff line change
@@ -2626,9 +2626,9 @@ dependencies = [
26262626

26272627
[[package]]
26282628
name = "racer"
2629-
version = "2.1.38"
2629+
version = "2.1.39"
26302630
source = "registry+https://github.com/rust-lang/crates.io-index"
2631-
checksum = "51dd5fd4247115b28f3e038eb8cda76a0c6f9cb473f769f41f930af8adff22d0"
2631+
checksum = "b9424b4650b9c1134d0a1b34dab82319691e1c95fa8af1658fc640deb1b6823c"
26322632
dependencies = [
26332633
"bitflags",
26342634
"clap",
@@ -2954,19 +2954,19 @@ dependencies = [
29542954

29552955
[[package]]
29562956
name = "rustc-ap-rustc_arena"
2957-
version = "677.0.0"
2957+
version = "679.0.0"
29582958
source = "registry+https://github.com/rust-lang/crates.io-index"
2959-
checksum = "2958af0d6e0458434a25cd3a96f6e19f24f71bf50b900add520dec52e212866b"
2959+
checksum = "e8e941a8fc3878a111d2bbfe78e39522d884136f0b412b12592195f26f653476"
29602960
dependencies = [
29612961
"rustc-ap-rustc_data_structures",
29622962
"smallvec 1.4.2",
29632963
]
29642964

29652965
[[package]]
29662966
name = "rustc-ap-rustc_ast"
2967-
version = "677.0.0"
2967+
version = "679.0.0"
29682968
source = "registry+https://github.com/rust-lang/crates.io-index"
2969-
checksum = "0c82c2510460f2133548e62399e5acd30c25ae6ece30245baab3d1e00c2fefac"
2969+
checksum = "3b58b6b035710df7f339a2bf86f6dafa876efd95439540970e24609e33598ca6"
29702970
dependencies = [
29712971
"bitflags",
29722972
"rustc-ap-rustc_data_structures",
@@ -2981,11 +2981,11 @@ dependencies = [
29812981

29822982
[[package]]
29832983
name = "rustc-ap-rustc_ast_passes"
2984-
version = "677.0.0"
2984+
version = "679.0.0"
29852985
source = "registry+https://github.com/rust-lang/crates.io-index"
2986-
checksum = "83977da57f81c6edd89bad47e49136680eaa33288de4abb702e95358c2a0fc6c"
2986+
checksum = "3d379a900d6a1f098490d92ab83e87487dcee2e4ec3f04c3ac4512b5117b64e2"
29872987
dependencies = [
2988-
"itertools 0.8.2",
2988+
"itertools 0.9.0",
29892989
"rustc-ap-rustc_ast",
29902990
"rustc-ap-rustc_ast_pretty",
29912991
"rustc-ap-rustc_attr",
@@ -3000,9 +3000,9 @@ dependencies = [
30003000

30013001
[[package]]
30023002
name = "rustc-ap-rustc_ast_pretty"
3003-
version = "677.0.0"
3003+
version = "679.0.0"
30043004
source = "registry+https://github.com/rust-lang/crates.io-index"
3005-
checksum = "becf4ca1638b214694c71a8752192683048ab8bd47947cc481f57bd48157eeb9"
3005+
checksum = "658d925c0da9e3c5cddc5e54f4fa8c03b41aff1fc6dc5e41837c1118ad010ac0"
30063006
dependencies = [
30073007
"rustc-ap-rustc_ast",
30083008
"rustc-ap-rustc_span",
@@ -3012,9 +3012,9 @@ dependencies = [
30123012

30133013
[[package]]
30143014
name = "rustc-ap-rustc_attr"
3015-
version = "677.0.0"
3015+
version = "679.0.0"
30163016
source = "registry+https://github.com/rust-lang/crates.io-index"
3017-
checksum = "0f21ca5dadce8a40d75a2756b77eab75b4c2d827f645c622dd93ee2285599640"
3017+
checksum = "3f387037534f34c148aed753622677500e42d190a095670e7ac3fffc09811a59"
30183018
dependencies = [
30193019
"rustc-ap-rustc_ast",
30203020
"rustc-ap-rustc_ast_pretty",
@@ -3031,20 +3031,19 @@ dependencies = [
30313031

30323032
[[package]]
30333033
name = "rustc-ap-rustc_data_structures"
3034-
version = "677.0.0"
3034+
version = "679.0.0"
30353035
source = "registry+https://github.com/rust-lang/crates.io-index"
3036-
checksum = "a4cd204764727fde9abf75333eb661f058bfc7242062d91019440fe1b240688b"
3036+
checksum = "14ffd17a37e00d77926a0713f191c59ff3aeb2b551a024c7cfffce14bab79be8"
30373037
dependencies = [
30383038
"bitflags",
30393039
"cfg-if",
30403040
"crossbeam-utils 0.7.2",
30413041
"ena",
30423042
"indexmap",
30433043
"jobserver",
3044-
"lazy_static",
30453044
"libc",
30463045
"measureme",
3047-
"parking_lot 0.10.2",
3046+
"parking_lot 0.11.0",
30483047
"rustc-ap-rustc_graphviz",
30493048
"rustc-ap-rustc_index",
30503049
"rustc-ap-rustc_macros",
@@ -3062,9 +3061,9 @@ dependencies = [
30623061

30633062
[[package]]
30643063
name = "rustc-ap-rustc_errors"
3065-
version = "677.0.0"
3064+
version = "679.0.0"
30663065
source = "registry+https://github.com/rust-lang/crates.io-index"
3067-
checksum = "58116f119e37f14c029f99077b347069621118e048a69df74695b98204e7c136"
3066+
checksum = "2b3263ddcfa9eb911e54a4e8088878dd9fd10e00d8b99b01033ba4a2733fe91d"
30683067
dependencies = [
30693068
"annotate-snippets 0.8.0",
30703069
"atty",
@@ -3081,9 +3080,9 @@ dependencies = [
30813080

30823081
[[package]]
30833082
name = "rustc-ap-rustc_expand"
3084-
version = "677.0.0"
3083+
version = "679.0.0"
30853084
source = "registry+https://github.com/rust-lang/crates.io-index"
3086-
checksum = "48e3c4bda9b64b92805bebe7431fdb8e24fd112b35a8c6d2174827441f10a6b2"
3085+
checksum = "e1ab7e68cede8a2273fd8b8623002ce9dc832e061dfc3330e9bcc1fc2a722d73"
30873086
dependencies = [
30883087
"rustc-ap-rustc_ast",
30893088
"rustc-ap-rustc_ast_passes",
@@ -3104,32 +3103,31 @@ dependencies = [
31043103

31053104
[[package]]
31063105
name = "rustc-ap-rustc_feature"
3107-
version = "677.0.0"
3106+
version = "679.0.0"
31083107
source = "registry+https://github.com/rust-lang/crates.io-index"
3109-
checksum = "4b612bb67d3fc49f395b03fc4ea4384a0145b05afbadab725803074ec827632b"
3108+
checksum = "eea2dc95421bc19bbd4d939399833a882c46b684283b4267ad1fcf982fc043d9"
31103109
dependencies = [
3111-
"lazy_static",
31123110
"rustc-ap-rustc_data_structures",
31133111
"rustc-ap-rustc_span",
31143112
]
31153113

31163114
[[package]]
31173115
name = "rustc-ap-rustc_fs_util"
3118-
version = "677.0.0"
3116+
version = "679.0.0"
31193117
source = "registry+https://github.com/rust-lang/crates.io-index"
3120-
checksum = "7630ad1a73a8434ee920676148cb5440ac57509bd20e94ec41087fb0b1d11c28"
3118+
checksum = "1e44c1804f09635f83f6cf1e04c2e92f8aeb7b4e850ac6c53d373dab02c13053"
31213119

31223120
[[package]]
31233121
name = "rustc-ap-rustc_graphviz"
3124-
version = "677.0.0"
3122+
version = "679.0.0"
31253123
source = "registry+https://github.com/rust-lang/crates.io-index"
3126-
checksum = "a603fca4817062eb4fb23ff129d475bd66a69fb32f34ed4362ae950cf814b49d"
3124+
checksum = "dc491f2b9be6e928f6df6b287549b8d50c48e8eff8638345155f40fa2cfb785d"
31273125

31283126
[[package]]
31293127
name = "rustc-ap-rustc_index"
3130-
version = "677.0.0"
3128+
version = "679.0.0"
31313129
source = "registry+https://github.com/rust-lang/crates.io-index"
3132-
checksum = "9850c4a5d7c341513e10802bca9588bf8f452ceea2d5cfa87b934246a52622bc"
3130+
checksum = "fa73f3fed413cdb6290738a10267da17b9ae8e02087334778b9a8c9491c5efc0"
31333131
dependencies = [
31343132
"arrayvec",
31353133
"rustc-ap-rustc_macros",
@@ -3138,18 +3136,18 @@ dependencies = [
31383136

31393137
[[package]]
31403138
name = "rustc-ap-rustc_lexer"
3141-
version = "677.0.0"
3139+
version = "679.0.0"
31423140
source = "registry+https://github.com/rust-lang/crates.io-index"
3143-
checksum = "6d86722e5a1a615b198327d0d794cd9cbc8b9db4542276fc51fe078924de68ea"
3141+
checksum = "e993881244a92f3b44cf43c8f22ae2ca5cefe4f55a34e2b65b72ee66fe5ad077"
31443142
dependencies = [
31453143
"unicode-xid",
31463144
]
31473145

31483146
[[package]]
31493147
name = "rustc-ap-rustc_macros"
3150-
version = "677.0.0"
3148+
version = "679.0.0"
31513149
source = "registry+https://github.com/rust-lang/crates.io-index"
3152-
checksum = "b3fc8482e44cabdda7ac9a8e224aef62ebdf95274d629dac8db3b42321025fea"
3150+
checksum = "4effe366556e1d75344764adf4d54cba7c2fad33dbd07588e96d0853831ddc7c"
31533151
dependencies = [
31543152
"proc-macro2",
31553153
"quote",
@@ -3159,9 +3157,9 @@ dependencies = [
31593157

31603158
[[package]]
31613159
name = "rustc-ap-rustc_parse"
3162-
version = "677.0.0"
3160+
version = "679.0.0"
31633161
source = "registry+https://github.com/rust-lang/crates.io-index"
3164-
checksum = "3716cdcd978a91dbd4a2788400e90e809527f841426fbeb92f882f9b8582f3ab"
3162+
checksum = "0342675835251571471d3dca9ea1576a853a8dfa1f4b0084db283c861223cb60"
31653163
dependencies = [
31663164
"bitflags",
31673165
"rustc-ap-rustc_ast",
@@ -3179,19 +3177,19 @@ dependencies = [
31793177

31803178
[[package]]
31813179
name = "rustc-ap-rustc_serialize"
3182-
version = "677.0.0"
3180+
version = "679.0.0"
31833181
source = "registry+https://github.com/rust-lang/crates.io-index"
3184-
checksum = "c68046d07988b349b2e1c8bc1c9664a1d06519354aa677b9df358c5c5c058da0"
3182+
checksum = "438255ed968d73bf6573aa18d3b8d33c0a85ecdfd14160ef09ff813938e0606c"
31853183
dependencies = [
31863184
"indexmap",
31873185
"smallvec 1.4.2",
31883186
]
31893187

31903188
[[package]]
31913189
name = "rustc-ap-rustc_session"
3192-
version = "677.0.0"
3190+
version = "679.0.0"
31933191
source = "registry+https://github.com/rust-lang/crates.io-index"
3194-
checksum = "85735553501a4de0c8904e37b7ccef79cc1c585a7d7f2cfa02cc38e0d149f982"
3192+
checksum = "7d61ff76dede8eb827f6805754900d1097a7046f938f950231b62b448f55bf78"
31953193
dependencies = [
31963194
"bitflags",
31973195
"getopts",
@@ -3210,9 +3208,9 @@ dependencies = [
32103208

32113209
[[package]]
32123210
name = "rustc-ap-rustc_span"
3213-
version = "677.0.0"
3211+
version = "679.0.0"
32143212
source = "registry+https://github.com/rust-lang/crates.io-index"
3215-
checksum = "1c49ae8a0d3b9e27c6ffe8febeaa30f899294fff012de70625f9ee81c54fda85"
3213+
checksum = "1c267f15c3cfc82a8a441d2bf86bcccf299d1eb625822468e3d8ee6f7c5a1c89"
32163214
dependencies = [
32173215
"cfg-if",
32183216
"md-5",
@@ -3229,9 +3227,9 @@ dependencies = [
32293227

32303228
[[package]]
32313229
name = "rustc-ap-rustc_target"
3232-
version = "677.0.0"
3230+
version = "679.0.0"
32333231
source = "registry+https://github.com/rust-lang/crates.io-index"
3234-
checksum = "1765f447594740c501c7b666b87639aa7c1dae2bf8c3166d5d2dca16646fd034"
3232+
checksum = "8b1b4b266c4d44aac0f7f83b6741d8f0545b03d1ce32f3b5254f2014225cb96c"
32353233
dependencies = [
32363234
"bitflags",
32373235
"rustc-ap-rustc_data_structures",
@@ -4248,7 +4246,7 @@ dependencies = [
42484246

42494247
[[package]]
42504248
name = "rustfmt-nightly"
4251-
version = "1.4.21"
4249+
version = "1.4.22"
42524250
dependencies = [
42534251
"annotate-snippets 0.6.1",
42544252
"anyhow",

src/tools/rls

0 commit comments

Comments
 (0)