Update cargo.

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"

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"),
                 )

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);