Skip to content

Commit 8ce7ce2

Browse files
Rollup merge of rust-lang#54916 - matthiaskrgr:submodules_update, r=oli-obk
submodules: update clippy, rls and cargo, fix toolstate rustfmt update failed because of different rustc-ap-syntax versions. fix clippy toolstate failure Fixes rust-lang#54697
2 parents 965dad5 + 87f5fc4 commit 8ce7ce2

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

src/Cargo.lock

+11-10
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ dependencies = [
204204
"env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
205205
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
206206
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
207-
"flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
207+
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
208208
"fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
209209
"fwdansi 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
210210
"git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -737,7 +737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
737737

738738
[[package]]
739739
name = "flate2"
740-
version = "1.0.2"
740+
version = "1.0.3"
741741
source = "registry+https://github.com/rust-lang/crates.io-index"
742742
dependencies = [
743743
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -969,7 +969,7 @@ version = "0.0.0"
969969
dependencies = [
970970
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
971971
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
972-
"flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
972+
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
973973
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
974974
"rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
975975
"tar 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1659,7 +1659,7 @@ dependencies = [
16591659

16601660
[[package]]
16611661
name = "racer"
1662-
version = "2.1.6"
1662+
version = "2.1.7"
16631663
source = "registry+https://github.com/rust-lang/crates.io-index"
16641664
dependencies = [
16651665
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1807,7 +1807,7 @@ dependencies = [
18071807
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
18081808
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
18091809
"ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
1810-
"racer 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
1810+
"racer 2.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
18111811
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
18121812
"rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
18131813
"regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1824,6 +1824,7 @@ dependencies = [
18241824
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
18251825
"serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
18261826
"serde_json 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
1827+
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
18271828
"url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
18281829
"walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
18291830
]
@@ -1899,7 +1900,7 @@ dependencies = [
18991900
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
19001901
"byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
19011902
"chalk-engine 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1902-
"flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
1903+
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
19031904
"fmt_macros 0.0.0",
19041905
"graphviz 0.0.0",
19051906
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2143,7 +2144,7 @@ dependencies = [
21432144
name = "rustc_codegen_utils"
21442145
version = "0.0.0"
21452146
dependencies = [
2146-
"flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
2147+
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
21472148
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
21482149
"rustc 0.0.0",
21492150
"rustc_data_structures 0.0.0",
@@ -2286,7 +2287,7 @@ dependencies = [
22862287
name = "rustc_metadata"
22872288
version = "0.0.0"
22882289
dependencies = [
2289-
"flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
2290+
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
22902291
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
22912292
"proc_macro 0.0.0",
22922293
"rustc 0.0.0",
@@ -3233,7 +3234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32333234
"checksum failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "946d0e98a50d9831f5d589038d2ca7f8f455b1c21028c0db0e84116a12696426"
32343235
"checksum filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "da4b9849e77b13195302c174324b5ba73eec9b236b24c221a61000daefb95c5f"
32353236
"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
3236-
"checksum flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "37847f133aae7acf82bb9577ccd8bda241df836787642654286e79679826a54b"
3237+
"checksum flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4af030962d89d62aa52cd9492083b1cd9b2d1a77764878102a6c0f86b4d5444d"
32373238
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
32383239
"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
32393240
"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -3331,7 +3332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33313332
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
33323333
"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
33333334
"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
3334-
"checksum racer 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "99e820b7f7701c834c3f6f8226f388c19c0ea948a3ef79ddc96aa7398b5ba87a"
3335+
"checksum racer 2.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0beefbfaed799c3554021a48856113ad53862311395f6d75376192884ba5fbe6"
33353336
"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
33363337
"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
33373338
"checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"

src/tools/clippy

src/tools/rls

Submodule rls updated from 15d4d4a to 440a985

0 commit comments

Comments
 (0)