Merge pull request #1610 from matthiaskrgr/rustup_3

Rustup rust-lang/rust#67786
rust-lang · Jan 4, 2020 · 7c0489c · 7c0489c
2 parents 7010eee + 5cc3183
commit 7c0489c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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 }

diff --git 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
@@ -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};