From 97d8f3e5bdd84bfa93c2a69ba5c895139a232f7e Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Nov 2025 10:45:15 +0100 Subject: [PATCH] also rename core-stubs-compile-flags to minicore-compile-flags --- src/tools/compiletest/src/directives.rs | 10 +++++----- .../compiletest/src/directives/directive_names.rs | 2 +- src/tools/compiletest/src/runtest.rs | 2 +- .../ui/panic-runtime/need-abort-got-immediate-abort.rs | 2 +- .../ui/panic-runtime/need-immediate-abort-got-abort.rs | 2 +- .../panic-runtime/need-immediate-abort-got-unwind.rs | 2 +- .../panic-runtime/need-unwind-got-immediate-abort.rs | 2 +- .../abi-incompatible-target-feature-flag-enable.rs | 2 +- tests/ui/target-feature/tied-features-cli.rs | 2 +- .../target-feature/tied-features-no-implication-1.rs | 2 +- .../ui/target-feature/tied-features-no-implication.rs | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/tools/compiletest/src/directives.rs b/src/tools/compiletest/src/directives.rs index 6e4ba2b9f32e..f25294d8d198 100644 --- a/src/tools/compiletest/src/directives.rs +++ b/src/tools/compiletest/src/directives.rs @@ -202,7 +202,7 @@ pub(crate) struct TestProps { /// that don't otherwise want/need `-Z build-std`. pub add_minicore: bool, /// Add these flags to the build of `minicore`. - pub core_stubs_compile_flags: Vec, + pub minicore_compile_flags: Vec, /// Whether line annotatins are required for the given error kind. pub dont_require_annotations: HashSet, /// Whether pretty printers should be disabled in gdb. @@ -255,7 +255,7 @@ mod directives { pub const FILECHECK_FLAGS: &'static str = "filecheck-flags"; pub const NO_AUTO_CHECK_CFG: &'static str = "no-auto-check-cfg"; pub const ADD_MINICORE: &'static str = "add-minicore"; - pub const CORE_STUBS_COMPILE_FLAGS: &'static str = "core-stubs-compile-flags"; + pub const MINICORE_COMPILE_FLAGS: &'static str = "minicore-compile-flags"; pub const DISABLE_GDB_PRETTY_PRINTERS: &'static str = "disable-gdb-pretty-printers"; pub const COMPARE_OUTPUT_BY_LINES: &'static str = "compare-output-by-lines"; } @@ -312,7 +312,7 @@ impl TestProps { filecheck_flags: vec![], no_auto_check_cfg: false, add_minicore: false, - core_stubs_compile_flags: vec![], + minicore_compile_flags: vec![], dont_require_annotations: Default::default(), disable_gdb_pretty_printers: false, compare_output_by_lines: false, @@ -604,7 +604,7 @@ impl TestProps { self.update_add_minicore(ln, config); if let Some(flags) = - config.parse_name_value_directive(ln, CORE_STUBS_COMPILE_FLAGS) + config.parse_name_value_directive(ln, MINICORE_COMPILE_FLAGS) { let flags = split_flags(&flags); for flag in &flags { @@ -612,7 +612,7 @@ impl TestProps { panic!("you must use `//@ edition` to configure the edition"); } } - self.core_stubs_compile_flags.extend(flags); + self.minicore_compile_flags.extend(flags); } if let Some(err_kind) = diff --git a/src/tools/compiletest/src/directives/directive_names.rs b/src/tools/compiletest/src/directives/directive_names.rs index ad8eb41ef2a7..44bf9611064a 100644 --- a/src/tools/compiletest/src/directives/directive_names.rs +++ b/src/tools/compiletest/src/directives/directive_names.rs @@ -19,7 +19,6 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "check-test-line-numbers-match", "compare-output-by-lines", "compile-flags", - "core-stubs-compile-flags", "disable-gdb-pretty-printers", "doc-flags", "dont-check-compiler-stderr", @@ -141,6 +140,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "min-lldb-version", "min-llvm-version", "min-system-llvm-version", + "minicore-compile-flags", "needs-asm-support", "needs-backends", "needs-crate-type", diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 8b8031d58574..8b776f7e9289 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1341,7 +1341,7 @@ impl<'test> TestCx<'test> { rustc.args(&["--crate-type", "rlib"]); rustc.arg("-Cpanic=abort"); - rustc.args(self.props.core_stubs_compile_flags.clone()); + rustc.args(self.props.minicore_compile_flags.clone()); let res = self.compose_and_run(rustc, self.config.compile_lib_path.as_path(), None, None); if !res.status.success() { diff --git a/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs b/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs index 918394b2d32d..b3f7c96bd054 100644 --- a/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs +++ b/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs @@ -3,7 +3,7 @@ //@ compile-flags:-Cpanic=immediate-abort -Zunstable-options //@ no-prefer-dynamic //@ add-minicore -//@ core-stubs-compile-flags: -Cpanic=immediate-abort -Zunstable-options +//@ minicore-compile-flags: -Cpanic=immediate-abort -Zunstable-options #![feature(no_core)] #![no_std] diff --git a/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs b/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs index 070262ca9ec1..a86391101f52 100644 --- a/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs +++ b/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs @@ -3,7 +3,7 @@ //@ compile-flags:-C panic=abort //@ no-prefer-dynamic //@ add-minicore -//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort +//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] #![no_std] diff --git a/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs b/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs index 9cdb7a0ed1dd..7e1031da4ad2 100644 --- a/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs +++ b/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs @@ -3,7 +3,7 @@ //@ aux-build:needs-immediate-abort.rs //@ no-prefer-dynamic //@ add-minicore -//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort +//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] #![no_std] diff --git a/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs b/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs index 6f3f7202016a..a60ca012b7a4 100644 --- a/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs +++ b/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs @@ -3,7 +3,7 @@ //@ compile-flags:-C panic=immediate-abort -Zunstable-options //@ no-prefer-dynamic //@ add-minicore -//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort +//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] #![no_std] diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs index d3d2d6f62ec3..0cdaf3358d25 100644 --- a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs +++ b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs @@ -7,7 +7,7 @@ //@[x86] needs-llvm-components: x86 //@[riscv] compile-flags: --target=riscv32e-unknown-none-elf -Ctarget-feature=+d // FIXME(#147881): *disable* the feature again for minicore as otherwise that will fail to build. -//@[riscv] core-stubs-compile-flags: -Ctarget-feature=-d +//@[riscv] minicore-compile-flags: -Ctarget-feature=-d //@[riscv] needs-llvm-components: riscv //@ ignore-backends: gcc //@ add-minicore diff --git a/tests/ui/target-feature/tied-features-cli.rs b/tests/ui/target-feature/tied-features-cli.rs index af151e5520fc..ffa38721c7da 100644 --- a/tests/ui/target-feature/tied-features-cli.rs +++ b/tests/ui/target-feature/tied-features-cli.rs @@ -14,7 +14,7 @@ //@ ignore-backends: gcc //@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. -//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca +//@ minicore-compile-flags: -C target-feature=-pacg,-paca #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/tied-features-no-implication-1.rs b/tests/ui/target-feature/tied-features-no-implication-1.rs index 1b8e34221d79..326da8b8dcf3 100644 --- a/tests/ui/target-feature/tied-features-no-implication-1.rs +++ b/tests/ui/target-feature/tied-features-no-implication-1.rs @@ -6,7 +6,7 @@ //@ ignore-backends: gcc //@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. -//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca +//@ minicore-compile-flags: -C target-feature=-pacg,-paca #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/tied-features-no-implication.rs b/tests/ui/target-feature/tied-features-no-implication.rs index 14631411d89f..9543065bbf92 100644 --- a/tests/ui/target-feature/tied-features-no-implication.rs +++ b/tests/ui/target-feature/tied-features-no-implication.rs @@ -6,7 +6,7 @@ //@ ignore-backends: gcc //@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. -//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca +//@ minicore-compile-flags: -C target-feature=-pacg,-paca #![feature(no_core)] #![no_core]