Merge pull request #1054 from eddyb/rextern

Reintroduce `extern crate` for non-Cargo dependencies.

Author: eddyb

Cargo.lock

@@ -15,7 +15,7 @@ build = "build.rs"
 [dependencies]
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "9311f6d439e09da3ab918397a425be57da13f04a" }
 cargo_metadata = "0.6"
-clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "d6f01f3a6c16d2fc350c36fb704ef68277ef426e", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "183639b70bacf457920694d78a19cefe3565e1c0", optional = true }
 env_logger = "0.5"
 failure = "0.1.1"
 itertools = "0.7.3"
@@ -25,6 +25,7 @@ lazy_static = "1"
 log = "0.4"
 num_cpus = "1"
 racer = { version = "2.1.5", default-features = false }
+rand = "0.5.5"
 rayon = "1"
 rls-analysis = "0.16"
 rls-blacklist = "0.1.2"

Cargo.toml

@@ -7,22 +7,42 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-use getopts;
 use log::trace;
 use rls_data::Analysis;
 use rls_vfs::Vfs;
-use rustc::session::config::{self, ErrorOutputType, Input};
-use rustc::session::Session;
-use rustc_codegen_utils::codegen_backend::CodegenBackend;
-use rustc_driver::driver::CompileController;
-use rustc_driver::{run, run_compiler, Compilation, CompilerCalls, RustcDefaultCalls};
-use rustc_errors;
-use rustc_metadata::cstore::CStore;
-use rustc_resolve;
-use rustc_save_analysis as save;
-use rustc_save_analysis::CallbackHandler;
-use syntax::ast;
-use syntax::source_map::{FileLoader, RealFileLoader};
+
+// FIXME: switch to something more ergonomic here, once available.
+// (currently there is no way to opt into sysroot crates w/o `extern crate`)
+#[allow(unused_extern_crates)]
+extern crate getopts;
+#[allow(unused_extern_crates)]
+extern crate rustc;
+#[allow(unused_extern_crates)]
+extern crate rustc_codegen_utils;
+#[allow(unused_extern_crates)]
+extern crate rustc_driver;
+#[allow(unused_extern_crates)]
+extern crate rustc_errors;
+#[allow(unused_extern_crates)]
+extern crate rustc_metadata;
+#[allow(unused_extern_crates)]
+extern crate rustc_plugin;
+#[allow(unused_extern_crates)]
+extern crate rustc_resolve;
+#[allow(unused_extern_crates)]
+extern crate rustc_save_analysis;
+#[allow(unused_extern_crates)]
+extern crate syntax;
+use self::rustc::session::config::{self, ErrorOutputType, Input};
+use self::rustc::session::Session;
+use self::rustc_codegen_utils::codegen_backend::CodegenBackend;
+use self::rustc_driver::driver::CompileController;
+use self::rustc_driver::{run, run_compiler, Compilation, CompilerCalls, RustcDefaultCalls};
+use self::rustc_metadata::cstore::CStore;
+use self::rustc_save_analysis as save;
+use self::rustc_save_analysis::CallbackHandler;
+use self::syntax::ast;
+use self::syntax::source_map::{FileLoader, RealFileLoader};
 
 use crate::build::environment::{Environment, EnvironmentLockFacade};
 use crate::build::{BufWriter, BuildResult};
@@ -146,8 +166,8 @@ impl RlsRustcCalls {
 }
 
 #[cfg(feature = "clippy")]
-fn clippy_after_parse_callback(state: &mut ::rustc_driver::driver::CompileState<'_, '_>) {
-    use rustc_plugin::registry::Registry;
+fn clippy_after_parse_callback(state: &mut rustc_driver::driver::CompileState<'_, '_>) {
+    use self::rustc_plugin::registry::Registry;
 
     let mut registry = Registry::new(
         state.session,