Skip to content

Commit 58f42a6

Browse files
committed
replace config.toml to bootstrap.toml in src/ci, src/etc/* and tests/run-make
1 parent fdedc38 commit 58f42a6

File tree

8 files changed

+282
-282
lines changed

8 files changed

+282
-282
lines changed

src/ci/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ trap datecheck EXIT
226226
# sccache server at the start of the build, but no need to worry if this fails.
227227
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
228228

229-
# Our build may overwrite config.toml, so we remove it here
230-
rm -f config.toml
229+
# Our build may overwrite bootstrap.toml, so we remove it here
230+
rm -f bootstrap.toml
231231

232232
$SRC/configure $RUST_CONFIGURE_ARGS
233233

@@ -262,7 +262,7 @@ else
262262
fi
263263

264264
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
265-
rm -f config.toml
265+
rm -f bootstrap.toml
266266
$SRC/configure --set change-id=99999999
267267

268268
# Save the build metrics before we wipe the directory

src/etc/completions/x.fish

+46-46
Large diffs are not rendered by default.

src/etc/completions/x.ps1

+46-46
Large diffs are not rendered by default.

src/etc/completions/x.py.fish

+46-46
Large diffs are not rendered by default.

src/etc/completions/x.py.ps1

+46-46
Large diffs are not rendered by default.

src/etc/completions/x.py.zsh

+47-47
Large diffs are not rendered by default.

src/etc/completions/x.zsh

+47-47
Large diffs are not rendered by default.

tests/run-make/linker-warning/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ fn run_rustc() -> Rustc {
44
let mut rustc = rustc();
55
rustc
66
.arg("main.rs")
7-
// NOTE: `link-self-contained` can vary depending on config.toml.
7+
// NOTE: `link-self-contained` can vary depending on bootstrap.toml.
88
// Make sure we use a consistent value.
99
.arg("-Clink-self-contained=-linker")
1010
.arg("-Zunstable-options")

0 commit comments

Comments
 (0)