From 6da85d6f998f06bde43508e7b43690c9e47c0614 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 14 Jan 2020 09:47:04 -0800 Subject: [PATCH 1/2] Update cargo, rls --- Cargo.lock | 32 ++++++++++++++++++----- src/tools/cargo | 2 +- src/tools/rls | 2 +- src/tools/rustc-workspace-hack/Cargo.toml | 2 +- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4836e15cd799a..2eb2c0aa1c7db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,6 +57,12 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "anyhow" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" + [[package]] name = "arc-swap" version = "0.3.7" @@ -277,6 +283,7 @@ dependencies = [ name = "cargo" version = "0.43.0" dependencies = [ + "anyhow", "atty", "bytesize", "cargo-platform", @@ -290,7 +297,6 @@ dependencies = [ "curl", "curl-sys", "env_logger 0.7.1", - "failure", "filetime", "flate2", "fs2", @@ -318,7 +324,7 @@ dependencies = [ "pretty_env_logger", "remove_dir_all", "rustc-workspace-hack", - "rustfix", + "rustfix 0.5.0", "same-file", "semver", "serde", @@ -590,7 +596,7 @@ dependencies = [ "log", "miow 0.3.3", "regex", - "rustfix", + "rustfix 0.4.6", "serde", "serde_json", "walkdir", @@ -610,7 +616,7 @@ dependencies = [ "log", "miow 0.3.3", "regex", - "rustfix", + "rustfix 0.4.6", "serde", "serde_derive", "serde_json", @@ -694,10 +700,10 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "crates-io" -version = "0.30.0" +version = "0.31.0" dependencies = [ + "anyhow", "curl", - "failure", "percent-encoding 2.1.0", "serde", "serde_derive", @@ -2936,13 +2942,13 @@ dependencies = [ name = "rls" version = "1.41.0" dependencies = [ + "anyhow", "cargo", "cargo_metadata 0.8.0", "clippy_lints", "crossbeam-channel", "difference", "env_logger 0.7.1", - "failure", "futures", "heck", "home", @@ -4005,6 +4011,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "rustfix" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804b11883a5ce0ad0378fbf95a8dea59ee6b51c331a73b8f471b6bdaa3bd40c1" +dependencies = [ + "anyhow", + "log", + "serde", + "serde_json", +] + [[package]] name = "rustfmt-config_proc_macro" version = "0.2.0" diff --git a/src/tools/cargo b/src/tools/cargo index 6e1ca924a67dd..ad3dbe10e1e65 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 6e1ca924a67dd1ac89c33f294ef26b5c43b89168 +Subproject commit ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d65 diff --git a/src/tools/rls b/src/tools/rls index 7c0489c5ff4f5..b27e117396963 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 7c0489c5ff4f5c594e65a3b22efd9ce373deab9b +Subproject commit b27e1173969639448cd2e486b1c5f0fcb1b3b17c diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index fced6c52012ab..936e8ae895a74 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -65,7 +65,7 @@ serde_json = { version = "1.0.31", features = ["raw_value"] } smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] } smallvec = { version = "1.0", features = ['union', 'may_dangle'] } url = { version = "2.0", features = ['serde'] } -syn = { version = "0.15", features = ['full'] } +syn = { version = "0.15", features = ['full', 'extra-traits'] } [target.'cfg(not(windows))'.dependencies] openssl = { version = "0.10.12", optional = true } From 55cb505257f3dd86fbae051fe90dc34efa7d0151 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 14 Jan 2020 09:50:55 -0800 Subject: [PATCH 2/2] Update rustfix in compiletest. --- Cargo.lock | 2 +- src/tools/compiletest/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2eb2c0aa1c7db..a1adc820d2e42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -596,7 +596,7 @@ dependencies = [ "log", "miow 0.3.3", "regex", - "rustfix 0.4.6", + "rustfix 0.5.0", "serde", "serde_json", "walkdir", diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 80ef8dd662637..a26c3a4acabfa 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -12,7 +12,7 @@ log = "0.4" regex = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -rustfix = "0.4.1" +rustfix = "0.5.0" lazy_static = "1.0" walkdir = "2"