Partially revert change to filter debug_assertions.

ehuss · ehuss · commit b8ab32ea31ba · 2020-03-05T08:20:52.000-08:00
diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs
@@ -192,7 +192,10 @@ impl TargetInfo {
 
     fn not_user_specific_cfg(cfg: &CargoResult<Cfg>) -> bool {
         if let Ok(Cfg::Name(cfg_name)) = cfg {
-            if cfg_name == "debug_assertions" || cfg_name == "proc_macro" {
+            // This should also include "debug_assertions", but it causes
+            // regressions. Maybe some day in the distant future it can be
+            // added (and possibly change the warning to an error).
+            if cfg_name == "proc_macro" {
                 return false;
             }
         }
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
@@ -228,6 +228,11 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
         }
     }
     for (k, v) in cfg_map {
+        if k == "debug_assertions" {
+            // This cfg is always true and misleading, so avoid setting it.
+            // That is because Cargo queries rustc without any profile settings.
+            continue;
+        }
         let k = format!("CARGO_CFG_{}", super::envify(&k));
         match v {
             Some(list) => {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,10 @@ impl TargetInfo {`
`192`	`192`
`193`	`193`	`fn not_user_specific_cfg(cfg: &CargoResult<Cfg>) -> bool {`
`194`	`194`	`if let Ok(Cfg::Name(cfg_name)) = cfg {`
`195`		`- if cfg_name == "debug_assertions" \|\| cfg_name == "proc_macro" {`
	`195`	`+ // This should also include "debug_assertions", but it causes`
	`196`	`+ // regressions. Maybe some day in the distant future it can be`
	`197`	`+ // added (and possibly change the warning to an error).`
	`198`	`+ if cfg_name == "proc_macro" {`
`196`	`199`	`return false;`
`197`	`200`	`}`
`198`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,11 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`for (k, v) in cfg_map {`
	`231`	`+ if k == "debug_assertions" {`
	`232`	`+ // This cfg is always true and misleading, so avoid setting it.`
	`233`	`+ // That is because Cargo queries rustc without any profile settings.`
	`234`	`+ continue;`
	`235`	`+ }`
`231`	`236`	`let k = format!("CARGO_CFG_{}", super::envify(&k));`
`232`	`237`	`match v {`
`233`	`238`	`Some(list) => {`