From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Wed, 6 Jun 2018 17:22:58 +0000 (+0200)
Subject: Order can be important if cargo tests are run inside the rustc build system
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~5^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bdb89d997c689c1b576392a32b33d36b189ad20;p=cargo.git

Order can be important if cargo tests are run inside the rustc build system
---

diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index 40b7c53ae..8802b38cb 100644
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@@ -354,14 +354,14 @@ impl CliUnstable {
 }
 
 fn channel() -> String {
+    if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") {
+        return override_channel;
+    }
     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)