From 5d8f276e4d307be938bda00cce6bb4f3202b656b Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 13 May 2019 18:27:19 -0700 Subject: [PATCH 1/2] Update cargo and clippy --- Cargo.lock | 28 +++++++++++++--------------- Cargo.toml | 4 ++-- rls/src/build/cargo.rs | 2 ++ rls/src/project_model.rs | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a64772f3438..74e686536b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,14 +126,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cargo" version = "0.37.0" -source = "git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a#beb8fcb5248dc2e6aa488af9613216d5ccb31c6a" +source = "git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405#d56af31df1fbe45105ccd3b633297b2bc61e7405" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.25.0 (git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a)", + "crates-io 0.25.0 (git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405)", "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-hash 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -157,9 +157,10 @@ dependencies = [ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", "libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "opener 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "opener 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -218,7 +219,7 @@ dependencies = [ [[package]] name = "clippy_lints" version = "0.0.212" -source = "git+https://github.com/rust-lang/rust-clippy?rev=fc96aa036884183ddc68d2659f4633e6f138b4e0#fc96aa036884183ddc68d2659f4633e6f138b4e0" +source = "git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f#82b2dfb9f6113b074746c7702d9e28162770b52f" dependencies = [ "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -230,7 +231,6 @@ dependencies = [ "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -283,7 +283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "crates-io" version = "0.25.0" -source = "git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a#beb8fcb5248dc2e6aa488af9613216d5ccb31c6a" +source = "git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405#d56af31df1fbe45105ccd3b633297b2bc61e7405" dependencies = [ "curl 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1064,11 +1064,9 @@ dependencies = [ [[package]] name = "opener" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1380,9 +1378,9 @@ dependencies = [ name = "rls" version = "1.36.0" dependencies = [ - "cargo 0.37.0 (git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a)", + "cargo 0.37.0 (git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405)", "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=fc96aa036884183ddc68d2659f4633e6f138b4e0)", + "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2310,19 +2308,19 @@ dependencies = [ "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa" "checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010" -"checksum cargo 0.37.0 (git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a)" = "" +"checksum cargo 0.37.0 (git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405)" = "" "checksum cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "585784cac9b05c93a53b17a0b24a5cdd1dfdda5256f030e089b549d2390cc720" "checksum cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e" "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=fc96aa036884183ddc68d2659f4633e6f138b4e0)" = "" +"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f)" = "" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" "checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887" "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -"checksum crates-io 0.25.0 (git+https://github.com/rust-lang/cargo?rev=beb8fcb5248dc2e6aa488af9613216d5ccb31c6a)" = "" +"checksum crates-io 0.25.0 (git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405)" = "" "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94" @@ -2408,7 +2406,7 @@ dependencies = [ "checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" -"checksum opener 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "04b1d6b086d9b3009550f9b6f81b10ad9428cf14f404b8e1a3a06f6f012c8ec9" +"checksum opener 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "998c59e83d9474c01127a96e023b7a04bb061dd286bf8bb939d31dc8d31a7448" "checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d" diff --git a/Cargo.toml b/Cargo.toml index ec8199aca10..ae1d556cc8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,9 +29,9 @@ rls-rustc = { version = "0.6.0", path = "rls-rustc" } rls-span = "0.5" rls-vfs = "0.8" -cargo = { git = "https://github.com/rust-lang/cargo", rev = "beb8fcb5248dc2e6aa488af9613216d5ccb31c6a" } +cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" } cargo_metadata = "0.7" -clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "fc96aa036884183ddc68d2659f4633e6f138b4e0", optional = true } +clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "82b2dfb9f6113b074746c7702d9e28162770b52f", optional = true } env_logger = "0.6" failure = "0.1.1" home = "0.3" diff --git a/rls/src/build/cargo.rs b/rls/src/build/cargo.rs index 4783540fd17..74155f4537d 100644 --- a/rls/src/build/cargo.rs +++ b/rls/src/build/cargo.rs @@ -388,6 +388,8 @@ impl Executor for RlsExecutor { id: PackageId, target: &Target, mode: CompileMode, + _on_stdout_line: &mut dyn FnMut(&str) -> CargoResult<()>, + _on_stderr_line: &mut dyn FnMut(&str) -> CargoResult<()>, ) -> CargoResult<()> { // Use JSON output so that we can parse the rustc output. cargo_cmd.arg("--error-format=json"); diff --git a/rls/src/project_model.rs b/rls/src/project_model.rs index a374a733a44..c6f56ee7baf 100644 --- a/rls/src/project_model.rs +++ b/rls/src/project_model.rs @@ -47,8 +47,8 @@ impl ProjectModel { let mut config = Config::default()?; // Enable nightly flag for cargo(see #1043) cargo::core::enable_nightly_features(); - // frozen = false, locked = false - config.configure(0, Some(true), &None, false, false, &None, &[])?; + // frozen = false, locked = false, offline = false + config.configure(0, Some(true), &None, false, false, false, &None, &[])?; let ws = Workspace::new(&ws_manifest, &config)?; // get resolve from lock file let prev = { From e18ff492292baa58abb8090fe152e3a47c732736 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sat, 18 May 2019 09:31:22 -0700 Subject: [PATCH 2/2] Update clippy. --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74e686536b7..8881b909e2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "clippy_lints" version = "0.0.212" -source = "git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f#82b2dfb9f6113b074746c7702d9e28162770b52f" +source = "git+https://github.com/rust-lang/rust-clippy?rev=60a609acaed3bf2b3ec6ab995bccf0f03bc26060#60a609acaed3bf2b3ec6ab995bccf0f03bc26060" dependencies = [ "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1380,7 +1380,7 @@ version = "1.36.0" dependencies = [ "cargo 0.37.0 (git+https://github.com/rust-lang/cargo?rev=d56af31df1fbe45105ccd3b633297b2bc61e7405)", "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f)", + "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=60a609acaed3bf2b3ec6ab995bccf0f03bc26060)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2313,7 +2313,7 @@ dependencies = [ "checksum cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e" "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=82b2dfb9f6113b074746c7702d9e28162770b52f)" = "" +"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=60a609acaed3bf2b3ec6ab995bccf0f03bc26060)" = "" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" diff --git a/Cargo.toml b/Cargo.toml index ae1d556cc8a..f6facee400f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ rls-vfs = "0.8" cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" } cargo_metadata = "0.7" -clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "82b2dfb9f6113b074746c7702d9e28162770b52f", optional = true } +clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "60a609acaed3bf2b3ec6ab995bccf0f03bc26060", optional = true } env_logger = "0.6" failure = "0.1.1" home = "0.3"