Skip to content

Commit 99aa4ed

Browse files
committed
replace config.toml to bootstrap.toml in src/ci, src/etc/* and tests/run-make
1 parent 3723f15 commit 99aa4ed

File tree

8 files changed

+281
-281
lines changed

8 files changed

+281
-281
lines changed

Diff for: src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ trap datecheck EXIT
229229
# sccache server at the start of the build, but no need to worry if this fails.
230230
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
231231

232-
# Our build may overwrite config.toml, so we remove it here
233-
rm -f config.toml
232+
# Our build may overwrite bootstrap.toml, so we remove it here
233+
rm -f bootstrap.toml
234234

235235
$SRC/configure $RUST_CONFIGURE_ARGS
236236

Diff for: src/etc/completions/x.fish

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

Diff for: src/etc/completions/x.ps1

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

Diff for: src/etc/completions/x.py.fish

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

Diff for: src/etc/completions/x.py.ps1

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

Diff for: src/etc/completions/x.py.zsh

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

Diff for: src/etc/completions/x.zsh

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

Diff for: 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)