Merge pull request #2948 from CAD97/patch-2

Consider "dev" as nightly for feature (un)gating

Author: nrc

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)
 }
 

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)
     };
 }