diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-05-08 14:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 14:11:49 +0200 |
| commit | 5cef212dcaba5864aee2c32bcd62d9f21617ce67 (patch) | |
| tree | 7ffeb247aa04848b86c4addde16931e4a28e72b6 /src | |
| parent | 8f247c1804b22b76e9c4391692270365f5131a61 (diff) | |
| parent | cd291b8e516767eaae2edf1cb968d49a005eecfa (diff) | |
| download | rust-5cef212dcaba5864aee2c32bcd62d9f21617ce67.tar.gz rust-5cef212dcaba5864aee2c32bcd62d9f21617ce67.zip | |
Rollup merge of #72001 - mibac138:cfg-version, r=petrochenkov
Adjust cfg(version) to lang team decision See https://github.com/rust-lang/rust/issues/64796#issuecomment-625474439 for details r? @petrochenkov who reviewed the original PR (#71314)
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_attr/build.rs | 3 | ||||
| -rw-r--r-- | src/librustc_attr/builtin.rs | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/librustc_attr/build.rs b/src/librustc_attr/build.rs index d230ba91039..863f2b7337b 100644 --- a/src/librustc_attr/build.rs +++ b/src/librustc_attr/build.rs @@ -1,4 +1,5 @@ fn main() { println!("cargo:rerun-if-changed=build.rs"); - println!("cargo:rerun-if-env-changed=CFG_VERSION"); + println!("cargo:rerun-if-env-changed=CFG_RELEASE"); + println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL"); } diff --git a/src/librustc_attr/builtin.rs b/src/librustc_attr/builtin.rs index ce38e3f5f4e..a592bbc2bf9 100644 --- a/src/librustc_attr/builtin.rs +++ b/src/librustc_attr/builtin.rs @@ -652,9 +652,12 @@ pub fn eval_condition( return false; } }; - let version = Version::parse(env!("CFG_VERSION")).unwrap(); + let channel = env!("CFG_RELEASE_CHANNEL"); + let nightly = channel == "nightly" || channel == "dev"; + let rustc_version = Version::parse(env!("CFG_RELEASE")).unwrap(); - version >= min_version + // See https://github.com/rust-lang/rust/issues/64796#issuecomment-625474439 for details + if nightly { rustc_version > min_version } else { rustc_version >= min_version } } ast::MetaItemKind::List(ref mis) => { for mi in mis.iter() { |