diff --git a/Cargo.lock b/Cargo.lock
index ff61b2b3247..ed043a114fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -118,12 +118,12 @@ dependencies = [
 [[package]]
 name = "cargo"
 version = "0.30.0"
-source = "git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556#1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556"
+source = "git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab#0b80061cacce00dabe8ca25448517d4ac27de2ab"
 dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556)",
+ "crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab)",
  "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "curl 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -147,7 +147,7 @@ dependencies = [
  "miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfix 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustfix 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -312,7 +312,7 @@ dependencies = [
 [[package]]
 name = "crates-io"
 version = "0.18.0"
-source = "git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556#1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556"
+source = "git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab#0b80061cacce00dabe8ca25448517d4ac27de2ab"
 dependencies = [
  "curl 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1177,7 +1177,7 @@ dependencies = [
 name = "rls"
 version = "0.129.0"
 dependencies = [
- "cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556)",
+ "cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab)",
  "cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy_lints 0.0.212 (git+https://github.com/rust-lang-nursery/rust-clippy?rev=1f656173723dce4efc3fc90ff5763a2186ec9089)",
  "crossbeam-channel 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1493,7 +1493,7 @@ dependencies = [
 
 [[package]]
 name = "rustfix"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1916,7 +1916,7 @@ dependencies = [
 "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
 "checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9"
 "checksum cargo 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "21dd0ac7737313b8c5c6fbfaf351aa93d4e90f66d4a33a11d1f3fb29584ac631"
-"checksum cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556)" = "<none>"
+"checksum cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab)" = "<none>"
 "checksum cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1efca0b863ca03ed4c109fb1c55e0bc4bbeb221d3e103d86251046b06a526bd0"
 "checksum cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6809b327f87369e6f3651efd2c5a96c49847a3ed2559477ecba79014751ee1"
 "checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275"
@@ -1932,7 +1932,7 @@ dependencies = [
 "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
 "checksum core-foundation-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3fb15cdbdd9cf8b82d97d0296bb5cd3631bba58d6e31650a002a8e7fb5721f9"
 "checksum crates-io 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f78703ef5348db1e3244fb6b496e840965fb4754a5319270f2bd77ddb856e1c"
-"checksum crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556)" = "<none>"
+"checksum crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=0b80061cacce00dabe8ca25448517d4ac27de2ab)" = "<none>"
 "checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
 "checksum crossbeam-channel 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efff2d411e0ac3731b9f6de882b2790fdd2de651577500a806ce78b95b2b9f31"
 "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
@@ -2060,7 +2060,7 @@ dependencies = [
 "checksum rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40f06724db71e18d68b3b946fdf890ca8c921d9edccc1404fdfdb537b0d12649"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a54aa04a10c68c1c4eacb4337fd883b435997ede17a9385784b990777686b09a"
-"checksum rustfix 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86f77b09d42bae4adfbcd105a8914e2d9fb46b63612c1a765b824a2b4a4bb814"
+"checksum rustfix 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "756567f00f7d89c9f89a5c401b8b1caaa122e27240b9eaadd0bb52ee0b680b1b"
 "checksum rustfmt-nightly 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d011cbbb7bfec821e3bc9dc2cb0ff3e1f413179e129a90ba1f1d256e31b4e846"
 "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
 "checksum schannel 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "dc1fabf2a7b6483a141426e1afd09ad543520a77ac49bd03c286e7696ccfd77f"
diff --git a/Cargo.toml b/Cargo.toml
index b3330c7fc64..ff0ec69bffc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["development-tools"]
 build = "build.rs"
 
 [dependencies]
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "0b80061cacce00dabe8ca25448517d4ac27de2ab" }
 cargo_metadata = "0.5.2"
 clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "1f656173723dce4efc3fc90ff5763a2186ec9089", optional = true }
 env_logger = "0.5"
diff --git a/src/build/cargo.rs b/src/build/cargo.rs
index adab860579f..2d83dab6914 100644
--- a/src/build/cargo.rs
+++ b/src/build/cargo.rs
@@ -168,7 +168,7 @@ fn run_cargo(
 
     let spec = Packages::from_flags(all, Vec::new(), packages)?;
 
-    let pkg_names = spec.into_package_id_specs(&ws)?.iter()
+    let pkg_names = spec.to_package_id_specs(&ws)?.iter()
         .map(|pkg_spec| pkg_spec.name().to_owned())
         .collect();
     trace!("Specified packages to be built by Cargo: {:#?}", pkg_names);
@@ -226,7 +226,8 @@ fn run_cargo(
         reached_primary.clone(),
     );
 
-    match compile_with_exec(&ws, &compile_opts, Arc::new(exec)) {
+    let exec = Arc::new(exec) as Arc<dyn Executor>;
+    match compile_with_exec(&ws, &compile_opts, &exec) {
         Ok(_) => {
             trace!(
                 "Created build plan after Cargo compilation routine: {:?}",