also rename core-stubs-compile-flags to minicore-compile-flags

Author: RalfJung

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<String>,
+    pub minicore_compile_flags: Vec<String>,
     /// Whether line annotatins are required for the given error kind.
     pub dont_require_annotations: HashSet<ErrorKind>,
     /// 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,15 +604,15 @@ 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 {
                             if flag == "--edition" || flag.starts_with("--edition=") {
                                 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) =

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",

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() {

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]

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]

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]

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]

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

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]
 

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]