use NO_DEBUG_ASSERTIONS properly and tweak formatting

Author: lolbinarycat

src/tools/run-make-support/src/env.rs

@@ -17,3 +17,10 @@ pub fn env_var_os(name: &str) -> OsString {
         None => panic!("failed to retrieve environment variable {name:?}"),
     }
 }
+
+/// Check if `NO_DEBUG_ASSERTIONS` is set (usually this may be set in CI jobs).
+#[track_caller]
+#[must_use]
+pub fn no_debug_assertions() -> bool {
+    std::env::var_os("NO_DEBUG_ASSERTIONS").is_some()
+}

src/tools/run-make-support/src/lib.rs

@@ -22,6 +22,7 @@ pub mod scoped_run;
 pub mod string;
 pub mod targets;
 pub mod symbols;
+
 // Internally we call our fs-related support module as `fs`, but re-export its content as `rfs`
 // to tests to avoid colliding with commonly used `use std::fs;`.
 mod fs;

tests/run-make/fmt-write-bloat/rmake.rs

@@ -1,13 +1,13 @@
 //@ ignore-windows
 //@ ignore-cross-compile
 
-use run_make_support::{rustc, symbols::any_symbol_contains};
+use run_make_support::{rustc, symbols::any_symbol_contains, env::no_debug_assertions};
 
 fn main() {
     rustc().input("main.rs").run();
     // panic machinery identifiers, these should not appear in the final binary
     let mut panic_syms = vec!["panic_bounds_check", "Debug"];
-    if !cfg!(debug_assertions) {
+    if no_debug_assertions() {
         // if debug assertions are allowed, we need to allow these,
         // otherwise, add them to the list of symbols to deny.
         panic_syms.extend_from_slice(&["panicking", "panic_fmt", "pad_integral", "Display"]);