From a15df80e967f2bb35b95a1e717a3fbe6f272f765 Mon Sep 17 00:00:00 2001 From: Christopher Durham Date: Thu, 23 Aug 2018 04:24:15 -0400 Subject: [PATCH 1/2] Consider "dev" as nightly for feature (un)gating Closes #2940 --- src/bin/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index e5f5b625eba..760333955a0 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -160,7 +160,7 @@ fn make_opts() -> Options { fn is_nightly() -> bool { option_env!("CFG_RELEASE_CHANNEL") - .map(|c| c == "nightly") + .map(|c| c == "nightly" || c == "dev") .unwrap_or(false) } From 8cc4200b7de6794ba97ae253538e85f63a8080cf Mon Sep 17 00:00:00 2001 From: Christopher Durham Date: Thu, 23 Aug 2018 04:28:44 -0400 Subject: [PATCH 2/2] Consider "dev" as nightly for feature (un)gating --- src/config/config_type.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/config_type.rs b/src/config/config_type.rs index 82cf0e19a8f..aea19b34375 100644 --- a/src/config/config_type.rs +++ b/src/config/config_type.rs @@ -73,7 +73,7 @@ impl ConfigType for IgnoreList { macro_rules! is_nightly_channel { () => { option_env!("CFG_RELEASE_CHANNEL") - .map(|c| c == "nightly") + .map(|c| c == "nightly" || c == "dev") .unwrap_or(true) }; }