Merge pull request steveklabnik#115 from steveklabnik/fix-build

Fix the build

Author: steveklabnik

Cargo.lock

@@ -17,11 +17,13 @@ clap = "2.24.2"
 error-chain = "=0.11.0-rc.2"
 indicatif = "0.6.0"
 rayon = "0.8.2"
-rls-analysis = "0.4.0"
 serde = "1.0.11"
 serde_derive = "1.0.11"
 serde_json = "1.0.2"
 
+[dependencies.rls-analysis]
+git = "http://github.com/steveklabnik/rls-analysis"
+
 [build-dependencies]
 error-chain = "=0.11.0-rc.2"
 quote = "0.3"

Cargo.toml

@@ -25,7 +25,7 @@ use std::io::prelude::*;
 use std::path::PathBuf;
 
 use analysis::AnalysisHost;
-use analysis::raw::DefKind;
+use analysis::DefKind;
 use indicatif::ProgressBar;
 use rayon::prelude::*;
 
@@ -141,7 +141,7 @@ fn generate_and_load_analysis(config: &Config) -> Result<()> {
     let spinner = ProgressBar::new_spinner();
     spinner.enable_steady_tick(50);
     spinner.set_message("Loading save analysis data: In Progress");
-    config.host.reload(manifest_path, manifest_path, true)?;
+    config.host.reload(manifest_path, manifest_path)?;
     spinner.finish_with_message("Loading save analysis data: Done");
 
     Ok(())

src/lib.rs

@@ -141,7 +141,7 @@ fn generate_analysis(source_file: &Path, tempdir: &Path) -> Result<AnalysisHost>
     workaround(&tempdir)?;
 
     let host = AnalysisHost::new(Target::Debug);
-    host.reload(tempdir, tempdir, true)?;
+    host.reload(tempdir, tempdir)?;
 
     Ok(host)
 }