Skip to content

Commit e6f0ef0

Browse files
committed
also rename core-stubs-compile-flags to minicore-compile-flags
1 parent cdc0943 commit e6f0ef0

10 files changed

+11
-11
lines changed

src/tools/compiletest/src/directives.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ mod directives {
255255
pub const FILECHECK_FLAGS: &'static str = "filecheck-flags";
256256
pub const NO_AUTO_CHECK_CFG: &'static str = "no-auto-check-cfg";
257257
pub const ADD_MINICORE: &'static str = "add-minicore";
258-
pub const CORE_STUBS_COMPILE_FLAGS: &'static str = "core-stubs-compile-flags";
258+
pub const MINICORE_COMPILE_FLAGS: &'static str = "minicore-compile-flags";
259259
pub const DISABLE_GDB_PRETTY_PRINTERS: &'static str = "disable-gdb-pretty-printers";
260260
pub const COMPARE_OUTPUT_BY_LINES: &'static str = "compare-output-by-lines";
261261
}
@@ -604,7 +604,7 @@ impl TestProps {
604604
self.update_add_minicore(ln, config);
605605

606606
if let Some(flags) =
607-
config.parse_name_value_directive(ln, CORE_STUBS_COMPILE_FLAGS)
607+
config.parse_name_value_directive(ln, MINICORE_COMPILE_FLAGS)
608608
{
609609
let flags = split_flags(&flags);
610610
for flag in &flags {

src/tools/compiletest/src/directives/directive_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
1919
"check-test-line-numbers-match",
2020
"compare-output-by-lines",
2121
"compile-flags",
22-
"core-stubs-compile-flags",
2322
"disable-gdb-pretty-printers",
2423
"doc-flags",
2524
"dont-check-compiler-stderr",
@@ -141,6 +140,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
141140
"min-lldb-version",
142141
"min-llvm-version",
143142
"min-system-llvm-version",
143+
"minicore-compile-flags",
144144
"needs-asm-support",
145145
"needs-backends",
146146
"needs-crate-type",

tests/ui/panic-runtime/need-abort-got-immediate-abort.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ compile-flags:-Cpanic=immediate-abort -Zunstable-options
44
//@ no-prefer-dynamic
55
//@ add-minicore
6-
//@ core-stubs-compile-flags: -Cpanic=immediate-abort -Zunstable-options
6+
//@ minicore-compile-flags: -Cpanic=immediate-abort -Zunstable-options
77

88
#![feature(no_core)]
99
#![no_std]

tests/ui/panic-runtime/need-immediate-abort-got-abort.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ compile-flags:-C panic=abort
44
//@ no-prefer-dynamic
55
//@ add-minicore
6-
//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort
6+
//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort
77

88
#![feature(no_core)]
99
#![no_std]

tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ aux-build:needs-immediate-abort.rs
44
//@ no-prefer-dynamic
55
//@ add-minicore
6-
//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort
6+
//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort
77

88
#![feature(no_core)]
99
#![no_std]

tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ compile-flags:-C panic=immediate-abort -Zunstable-options
44
//@ no-prefer-dynamic
55
//@ add-minicore
6-
//@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort
6+
//@ minicore-compile-flags: -Zunstable-options -Cpanic=immediate-abort
77

88
#![feature(no_core)]
99
#![no_std]

tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//@[x86] needs-llvm-components: x86
88
//@[riscv] compile-flags: --target=riscv32e-unknown-none-elf -Ctarget-feature=+d
99
// FIXME(#147881): *disable* the feature again for minicore as otherwise that will fail to build.
10-
//@[riscv] core-stubs-compile-flags: -Ctarget-feature=-d
10+
//@[riscv] minicore-compile-flags: -Ctarget-feature=-d
1111
//@[riscv] needs-llvm-components: riscv
1212
//@ ignore-backends: gcc
1313
//@ add-minicore

tests/ui/target-feature/tied-features-cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//@ ignore-backends: gcc
1515
//@ add-minicore
1616
// FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build.
17-
//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca
17+
//@ minicore-compile-flags: -C target-feature=-pacg,-paca
1818
#![feature(no_core)]
1919
#![no_core]
2020

tests/ui/target-feature/tied-features-no-implication-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//@ ignore-backends: gcc
77
//@ add-minicore
88
// FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build.
9-
//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca
9+
//@ minicore-compile-flags: -C target-feature=-pacg,-paca
1010
#![feature(no_core)]
1111
#![no_core]
1212

tests/ui/target-feature/tied-features-no-implication.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//@ ignore-backends: gcc
77
//@ add-minicore
88
// FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build.
9-
//@ core-stubs-compile-flags: -C target-feature=-pacg,-paca
9+
//@ minicore-compile-flags: -C target-feature=-pacg,-paca
1010

1111
#![feature(no_core)]
1212
#![no_core]

0 commit comments

Comments
 (0)