From d792c2d5f9b12c44fad3317b43788cd5f727c329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 4 Jan 2020 17:38:02 +0100 Subject: [PATCH 1/2] deps: update clippy --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- rls-rustc/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d94056db9c..034c7967d42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -274,7 +274,7 @@ dependencies = [ [[package]] name = "clippy_lints" version = "0.0.212" -source = "git+https://github.com/rust-lang/rust-clippy?rev=d9e38f57c125c5ac50397ec8a006fe49f17cd96c#d9e38f57c125c5ac50397ec8a006fe49f17cd96c" +source = "git+https://github.com/rust-lang/rust-clippy?rev=05b46034ea734f2b4436b700452771652ecc0074#05b46034ea734f2b4436b700452771652ecc0074" dependencies = [ "cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "if_chain 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1605,7 +1605,7 @@ version = "1.41.0" dependencies = [ "cargo 0.43.0 (git+https://github.com/rust-lang/cargo?rev=86134e7666a088682f20b76278c3ee096a315218)", "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=d9e38f57c125c5ac50397ec8a006fe49f17cd96c)", + "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=05b46034ea734f2b4436b700452771652ecc0074)", "crossbeam-channel 0.3.9 (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.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1688,7 +1688,7 @@ dependencies = [ name = "rls-rustc" version = "0.6.0" dependencies = [ - "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=d9e38f57c125c5ac50397ec8a006fe49f17cd96c)", + "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=05b46034ea734f2b4436b700452771652ecc0074)", "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2702,7 +2702,7 @@ dependencies = [ "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=d9e38f57c125c5ac50397ec8a006fe49f17cd96c)" = "" +"checksum clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=05b46034ea734f2b4436b700452771652ecc0074)" = "" "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 092db7f2d01..59f19860b27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true } cargo = { git = "https://github.com/rust-lang/cargo", rev = "86134e7666a088682f20b76278c3ee096a315218" } cargo_metadata = "0.8" -clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d9e38f57c125c5ac50397ec8a006fe49f17cd96c", optional = true } +clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "05b46034ea734f2b4436b700452771652ecc0074", optional = true } env_logger = "0.7" failure = "0.1.1" futures = { version = "0.1", optional = true } diff --git a/rls-rustc/Cargo.toml b/rls-rustc/Cargo.toml index 29ed695e477..b87f384fe3d 100644 --- a/rls-rustc/Cargo.toml +++ b/rls-rustc/Cargo.toml @@ -13,7 +13,7 @@ env_logger = "0.7" log = "0.4" failure = "0.1" rand = "0.7" -clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d9e38f57c125c5ac50397ec8a006fe49f17cd96c", optional = true } +clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "05b46034ea734f2b4436b700452771652ecc0074", optional = true } tokio = { version = "0.1", optional = true } futures = { version = "0.1", optional = true } serde = { version = "1", features = ["derive"], optional = true } From 5cc3183fc6604ec916f236ecc88c2146cf35d082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 4 Jan 2020 17:40:50 +0100 Subject: [PATCH 2/2] rustup https://github.com/rust-lang/rust/pull/67853 --- rls-rustc/src/lib.rs | 2 +- rls/src/build/rustc.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs index b01d22a1548..66b86cab1d8 100644 --- a/rls-rustc/src/lib.rs +++ b/rls-rustc/src/lib.rs @@ -5,7 +5,7 @@ extern crate rustc; extern crate rustc_driver; extern crate rustc_interface; extern crate rustc_save_analysis; -extern crate syntax; +extern crate rustc_span; use rustc::session::config::ErrorOutputType; use rustc::session::early_error; diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs index 81bb07281aa..7da3a4a4747 100644 --- a/rls/src/build/rustc.rs +++ b/rls/src/build/rustc.rs @@ -19,7 +19,7 @@ extern crate rustc_resolve; #[allow(unused_extern_crates)] extern crate rustc_save_analysis; #[allow(unused_extern_crates)] -extern crate syntax; +extern crate rustc_span; use std::collections::{HashMap, HashSet}; use std::env; @@ -41,8 +41,8 @@ use self::rustc_interface::interface; use self::rustc_interface::Queries; use self::rustc_save_analysis as save; use self::rustc_save_analysis::CallbackHandler; -use self::syntax::edition::Edition as RustcEdition; -use self::syntax::source_map::{FileLoader, RealFileLoader}; +use self::rustc_span::edition::Edition as RustcEdition; +use self::rustc_span::source_map::{FileLoader, RealFileLoader}; use crate::build::environment::{Environment, EnvironmentLockFacade}; use crate::build::plan::{Crate, Edition}; use crate::build::{BufWriter, BuildResult};