Merge pull request #2948 from CAD97/patch-2

Consider "dev" as nightly for feature (un)gating
This commit is contained in:
Nick Cameron 2018-08-27 09:23:16 +12:00 committed by GitHub
commit 454a20ac01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

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

View File

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