diff --git a/Cargo.lock b/Cargo.lock index e7cfa9f9461..adef7bd40c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -776,7 +776,7 @@ dependencies = [ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "racer 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rls-analysis 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rls-analysis 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-data 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -790,7 +790,7 @@ dependencies = [ [[package]] name = "rls-analysis" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "derive-new 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1339,7 +1339,7 @@ dependencies = [ "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b" "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db" -"checksum rls-analysis 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e85943bcf01e5e60e3f3cfc6730e4f4dc4b6b5679b79a44607d1865aec5bebcf" +"checksum rls-analysis 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "10fbe17ed9da2fa3686ebb018958e194a4a25f0b3a78382bfe334d09d3c641f4" "checksum rls-data 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48257ceade23c2e01a3ca8d2fc4226101b107f6a3c868f829cf3fd2f204a1fe6" "checksum rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b21ea952e9bf1569929abf1bb920262cde04b7b1b26d8e0260286302807299d2" "checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a" diff --git a/Cargo.toml b/Cargo.toml index 5ac2a8def27..0b03a15dcfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ languageserver-types = "0.12" lazy_static = "0.2" log = "0.3" racer = "2.0.12" -rls-analysis = "0.7.2" +rls-analysis = "0.8" rls-data = { version = "0.12", features = ["serialize-serde"] } rls-rustc = "0.1" rls-span = { version = "0.4", features = ["serialize-serde"] } diff --git a/src/actions/post_build.rs b/src/actions/post_build.rs index fba4d3377a2..7ffa6408e4a 100644 --- a/src/actions/post_build.rs +++ b/src/actions/post_build.rs @@ -118,12 +118,10 @@ impl PostBuildHandler { fn reload_analysis_from_memory(&self, analysis: Vec) { let cwd = ::std::env::current_dir().unwrap(); - for data in analysis.into_iter() { - if self.use_black_list { - self.analysis.reload_from_analysis(data, &self.project_path, &cwd, &CRATE_BLACKLIST).unwrap(); - } else { - self.analysis.reload_from_analysis(data, &self.project_path, &cwd, &[]).unwrap(); - } + if self.use_black_list { + self.analysis.reload_from_analysis(analysis, &self.project_path, &cwd, &CRATE_BLACKLIST).unwrap(); + } else { + self.analysis.reload_from_analysis(analysis, &self.project_path, &cwd, &[]).unwrap(); } } }