Update cargo

ehuss · May 14, 2019 · f2d51d0 · f2d51d0
1 parent 5b8e99b
commit f2d51d0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ rls-rustc = { version = "0.6.0", path = "rls-rustc" }
 rls-span = "0.5"
 rls-vfs = "0.8"
 
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "beb8fcb5248dc2e6aa488af9613216d5ccb31c6a" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" }
 cargo_metadata = "0.7"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "86f73473c8de4598f8ade982dbb9d44f89777c54", optional = true }
 env_logger = "0.6"

diff --git a/rls/src/build/cargo.rs b/rls/src/build/cargo.rs
@@ -388,6 +388,8 @@ impl Executor for RlsExecutor {
         id: PackageId,
         target: &Target,
         mode: CompileMode,
+        _on_stdout_line: &mut dyn FnMut(&str) -> CargoResult<()>,
+        _on_stderr_line: &mut dyn FnMut(&str) -> CargoResult<()>,
     ) -> CargoResult<()> {
         // Use JSON output so that we can parse the rustc output.
         cargo_cmd.arg("--error-format=json");

diff --git a/rls/src/project_model.rs b/rls/src/project_model.rs
@@ -47,8 +47,8 @@ impl ProjectModel {
         let mut config = Config::default()?;
         // Enable nightly flag for cargo(see #1043)
         cargo::core::enable_nightly_features();
-        // frozen = false, locked = false
-        config.configure(0, Some(true), &None, false, false, &None, &[])?;
+        // frozen = false, locked = false, offline = false
+        config.configure(0, Some(true), &None, false, false, false, &None, &[])?;
         let ws = Workspace::new(&ws_manifest, &config)?;
         // get resolve from lock file
         let prev = {