diff --git a/Cargo.lock b/Cargo.lock
index 56cba16e64c..e9ea7bcfe83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,12 +71,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cargo"
 version = "0.30.0"
-source = "git+https://github.com/rust-lang/cargo?rev=0ec7281b9c36ca7f724bfac8b029633910270a48#0ec7281b9c36ca7f724bfac8b029633910270a48"
+source = "git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a#9311f6d439e09da3ab918397a425be57da13f04a"
 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=0ec7281b9c36ca7f724bfac8b029633910270a48)",
+ "crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a)",
  "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.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "crates-io"
 version = "0.18.0"
-source = "git+https://github.com/rust-lang/cargo?rev=0ec7281b9c36ca7f724bfac8b029633910270a48#0ec7281b9c36ca7f724bfac8b029633910270a48"
+source = "git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a#9311f6d439e09da3ab918397a425be57da13f04a"
 dependencies = [
  "curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1088,7 +1088,7 @@ dependencies = [
 name = "rls"
 version = "0.130.5"
 dependencies = [
- "cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=0ec7281b9c36ca7f724bfac8b029633910270a48)",
+ "cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a)",
  "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy_lints 0.0.212 (git+https://github.com/rust-lang-nursery/rust-clippy?rev=d6f01f3a6c16d2fc350c36fb704ef68277ef426e)",
  "crossbeam-channel 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1745,7 +1745,7 @@ dependencies = [
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781"
-"checksum cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=0ec7281b9c36ca7f724bfac8b029633910270a48)" = "<none>"
+"checksum cargo 0.30.0 (git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a)" = "<none>"
 "checksum cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6809b327f87369e6f3651efd2c5a96c49847a3ed2559477ecba79014751ee1"
 "checksum cc 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "c37f0efaa4b9b001fa6f02d4b644dee4af97d3414df07c51e3e4f015f3a3e131"
 "checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
@@ -1757,7 +1757,7 @@ dependencies = [
 "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
 "checksum core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cc3532ec724375c7cb7ff0a097b714fde180bb1f6ed2ab27cfcd99ffca873cd2"
 "checksum core-foundation-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3fb15cdbdd9cf8b82d97d0296bb5cd3631bba58d6e31650a002a8e7fb5721f9"
-"checksum crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=0ec7281b9c36ca7f724bfac8b029633910270a48)" = "<none>"
+"checksum crates-io 0.18.0 (git+https://github.com/rust-lang/cargo?rev=9311f6d439e09da3ab918397a425be57da13f04a)" = "<none>"
 "checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
 "checksum crossbeam-channel 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6c0a94250b0278d7fc5a894c3d276b11ea164edc8bf8feb10ca1ea517b44a649"
 "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
diff --git a/Cargo.toml b/Cargo.toml
index 55b7bc84e77..1ed58c705a2 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 = "0ec7281b9c36ca7f724bfac8b029633910270a48" }
+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 }
 env_logger = "0.5"
diff --git a/src/build/plan.rs b/src/build/plan.rs
index e0cabcf58bc..2b9f53a8453 100644
--- a/src/build/plan.rs
+++ b/src/build/plan.rs
@@ -185,8 +185,10 @@ impl Plan {
         let build_scripts: HashMap<&Path, UnitKey> = self
             .units
             .iter()
-            .filter(|&(&(_, ref target, _), _)| *target.kind() == TargetKind::CustomBuild)
-            .map(|(key, unit)| (unit.target.src_path(), key.clone()))
+            .filter(|&(&(_, ref target, _), _)| {
+                *target.kind() == TargetKind::CustomBuild && target.src_path().is_path()
+            })
+            .map(|(key, unit)| (unit.target.src_path().path(), key.clone()))
             .collect();
         let other_targets: HashMap<UnitKey, &Path> = self
             .units
@@ -197,6 +199,7 @@ impl Plan {
                     key.clone(),
                     unit.target
                         .src_path()
+                        .path()
                         .parent()
                         .expect("no parent for src_path"),
                 )
diff --git a/src/project_model.rs b/src/project_model.rs
index 8cbcfba93da..e7720fd2d19 100644
--- a/src/project_model.rs
+++ b/src/project_model.rs
@@ -79,7 +79,7 @@ impl ProjectModel {
                     .iter()
                     .find(|t| t.is_lib())
                     // racer expect name 'underscored'(crate) name
-                    .map(|t| (t.src_path().to_owned(), t.name().replace('-', "_"))),
+                    .map(|t| (t.src_path().path().to_owned(), t.name().replace('-', "_"))),
                 deps: Vec::new(),
             });
             manifest_to_id.insert(manifest, pkg);