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

oli-obk · web-flow · commit 1bdb89d997c6 · 2018-06-06T19:22:58.000+02:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -354,14 +354,14 @@ impl CliUnstable {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`fn channel() -> String {`
	`357`	`+ if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") {`
	`358`	`+ return override_channel;`
	`359`	`+ }`
`357`	`360`	`if let Ok(staging) = env::var("RUSTC_BOOTSTRAP") {`
`358`	`361`	`if staging == "1" {`
`359`	`362`	`return "dev".to_string();`
`360`	`363`	`}`
`361`	`364`	`}`
`362`		`- if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") {`
`363`		`- return override_channel;`
`364`		`- }`
`365`	`365`	`::version()`
`366`	`366`	`.cfg_info`
`367`	`367`	`.map(\|c\| c.release_channel)`