From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Wed, 6 Jun 2018 12:33:50 +0000 (+0200)
Subject: Allow rustc bootstrap to use unstable features even though it's using a beta-cargo
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~5^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ac3cac444f1d29fbafe2cf829fd8a5fdd5361df5;p=cargo.git

Allow rustc bootstrap to use unstable features even though it's using a beta-cargo
---

diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index c08d4cddd..40b7c53ae 100644
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@@ -354,12 +354,18 @@ impl CliUnstable {
 }
 
 fn channel() -> String {
-    env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS").unwrap_or_else(|_| {
-        ::version()
-            .cfg_info
-            .map(|c| c.release_channel)
-            .unwrap_or_else(|| String::from("dev"))
-    })
+    if let Ok(staging) = env::var("RUSTC_BOOTSTRAP") {
+        if staging == "1" {
+            return "dev".to_string();
+        }
+    }
+    if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") {
+        return override_channel;
+    }
+    ::version()
+        .cfg_info
+        .map(|c| c.release_channel)
+        .unwrap_or_else(|| String::from("dev"))
 }
 
 fn nightly_features_allowed() -> bool {