From: Jon Gjengset <jon@thesquareplanet.com>
Date: Tue, 9 May 2017 03:44:41 +0000 (-0400)
Subject: Bring test of nightly in line with tests
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~46^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=213a2bf077d834e1694ae3442e0858b931b51e97;p=cargo.git

Bring test of nightly in line with tests
---

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index 9e81a9e64..11c25470f 100644
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -88,8 +88,10 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         // ignore CARGO_INCREMENTAL on anything but nightly. This allows users
         // to always have CARGO_INCREMENTAL set without getting unexpected
         // errors on stable/beta builds.
-        let incremental_enabled = incremental_enabled
-            && config.rustc()?.verbose_version.contains("nightly");
+        let is_nightly =
+            config.rustc()?.verbose_version.contains("-nightly") ||
+            config.rustc()?.verbose_version.contains("-dev");
+        let incremental_enabled = incremental_enabled && is_nightly;
 
         Ok(Context {
             ws: ws,