From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 11 Jan 2017 18:47:54 +0000 (-0500)
Subject: address suggestions from acrichto
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~41^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30e91b573b08097ef6f735a7a5df9c035a3ace10;p=cargo.git

address suggestions from acrichto
---

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index c3f4212e2..02c06daf0 100644
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -850,9 +850,9 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         self.lib_profile()
     }
 
-    pub fn incremental_args(&self, _unit: &Unit) -> CargoResult<Vec<String>> {
+    pub fn incremental_args(&self, unit: &Unit) -> CargoResult<Vec<String>> {
         if self.incremental_enabled {
-            Ok(vec![format!("-Zincremental={}", self.host.incremental().display())])
+            Ok(vec![format!("-Zincremental={}", self.layout(unit.kind).incremental().display())])
         } else {
             Ok(vec![])
         }
diff --git a/tests/build.rs b/tests/build.rs
index 1fea95cf4..fbf8b689b 100644
--- a/tests/build.rs
+++ b/tests/build.rs
@@ -44,12 +44,14 @@ fn cargo_compile_incremental() {
     assert_that(
         p.cargo_process("build").arg("-v").env("CARGO_INCREMENTAL", "1"),
         execs().with_stderr_contains(
-            "     Running `rustc [..] -Zincremental=[..]/target/debug/incremental`\n"));
+            "[RUNNING] `rustc [..] -Zincremental=[..][/]target[/]debug[/]incremental`\n")
+            .with_status(0));
 
     assert_that(
         p.cargo_process("test").arg("-v").env("CARGO_INCREMENTAL", "1"),
         execs().with_stderr_contains(
-            "     Running `rustc [..] -Zincremental=[..]/target/debug/incremental`\n"));
+            "[RUNNING] `rustc [..] -Zincremental=[..][/]target[/]debug[/]incremental`\n")
+               .with_status(0));
 }
 
 #[test]