CFG_RELEASE is mandatory, no need for option_env

dtolnay · dtolnay · commit 51f7fbab92ec · 2023-10-24T18:04:47.000-07:00
The same file already contains another env!("CFG_RELEASE") on line 632,
so it's impossible for this crate to compile without CFG_RELEASE set.
diff --git a/compiler/rustc_attr/src/builtin.rs b/compiler/rustc_attr/src/builtin.rs
@@ -25,8 +25,7 @@ use crate::session_diagnostics::{self, IncorrectReprFormatGenericCause};
 pub const VERSION_PLACEHOLDER: &str = "CURRENT_RUSTC_VERSION";
 
 pub fn rust_version_symbol() -> Symbol {
-    let version = option_env!("CFG_RELEASE").unwrap_or("<current>");
-    Symbol::intern(&version)
+    Symbol::intern(env!("CFG_RELEASE"))
 }
 
 pub fn is_builtin_attr(attr: &Attribute) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ use crate::session_diagnostics::{self, IncorrectReprFormatGenericCause};`
`25`	`25`	`pub const VERSION_PLACEHOLDER: &str = "CURRENT_RUSTC_VERSION";`
`26`	`26`
`27`	`27`	`pub fn rust_version_symbol() -> Symbol {`
`28`		`- let version = option_env!("CFG_RELEASE").unwrap_or("<current>");`
`29`		`- Symbol::intern(&version)`
	`28`	`+ Symbol::intern(env!("CFG_RELEASE"))`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`pub fn is_builtin_attr(attr: &Attribute) -> bool {`