Skip to content

Commit 7f6a7ce

Browse files
author
default
committed
rename config.toml to bootstrap.toml
1 parent 0a92516 commit 7f6a7ce

23 files changed

+52
-52
lines changed

src/backend/debugging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ which means that LLVM assertion failures can show up as compiler crashes (not
3838
ICEs but "real" crashes) and other sorts of weird behavior. If you are
3939
encountering these, it is a good idea to try using a compiler with LLVM
4040
assertions enabled - either an "alt" nightly or a compiler you build yourself
41-
by setting `[llvm] assertions=true` in your config.toml - and see whether
41+
by setting `[llvm] assertions=true` in your bootstrap.toml - and see whether
4242
anything turns up.
4343

4444
The rustc build process builds the LLVM tools into
@@ -160,7 +160,7 @@ from `./build/<host-triple>/llvm/bin/` with the LLVM IR emitted by rustc.
160160
When investigating the implementation of LLVM itself, you should be
161161
aware of its [internal debug infrastructure][llvm-debug].
162162
This is provided in LLVM Debug builds, which you enable for rustc
163-
LLVM builds by changing this setting in the config.toml:
163+
LLVM builds by changing this setting in the bootstrap.toml:
164164
```
165165
[llvm]
166166
# Indicates whether the LLVM assertions are enabled or not

src/backend/updating-llvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ so let's go through each in detail.
101101
Note that `profile = "compiler"` and other defaults set by `./x setup`
102102
download LLVM from CI instead of building it from source.
103103
You should disable this temporarily to make sure your changes are being used.
104-
This is done by having the following setting in `config.toml`:
104+
This is done by having the following setting in `bootstrap.toml`:
105105

106106
```toml
107107
[llvm]

src/building/compiler-documenting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ like the standard library (std) or the compiler (rustc).
3636
- Document internal rustc items
3737

3838
Compiler documentation is not built by default.
39-
To create it by default with `x doc`, modify `config.toml`:
39+
To create it by default with `x doc`, modify `bootstrap.toml`:
4040

4141
```toml
4242
[build]

src/building/how-to-build-and-run.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ similar to the one declared in section [What is `x.py`](#what-is-xpy), but
139139
it works as an independent process to execute the `x.py` rather than calling the
140140
shell to run the platform related scripts.
141141

142-
## Create a `config.toml`
142+
## Create a `bootstrap.toml`
143143

144144
To start, run `./x setup` and select the `compiler` defaults. This will do some initialization
145-
and create a `config.toml` for you with reasonable defaults. If you use a different default (which
145+
and create a `bootstrap.toml` for you with reasonable defaults. If you use a different default (which
146146
you'll likely want to do if you want to contribute to an area of rust other than the compiler, such
147147
as rustdoc), make sure to read information about that default (located in `src/bootstrap/defaults`)
148148
as the build process may be different for other defaults.
149149

150-
Alternatively, you can write `config.toml` by hand. See `config.example.toml` for all the available
150+
Alternatively, you can write `bootstrap.toml` by hand. See `bootstrap.example.toml` for all the available
151151
settings and explanations of them. See `src/bootstrap/defaults` for common settings to change.
152152

153153
If you have already built `rustc` and you change settings related to LLVM, then you may have to
@@ -186,7 +186,7 @@ See the chapters on
186186
Note that building will require a relatively large amount of storage space.
187187
You may want to have upwards of 10 or 15 gigabytes available to build the compiler.
188188

189-
Once you've created a `config.toml`, you are now ready to run
189+
Once you've created a `bootstrap.toml`, you are now ready to run
190190
`x`. There are a lot of options here, but let's start with what is
191191
probably the best "go to" command for building a local compiler:
192192

@@ -306,7 +306,7 @@ involve proc macros or build scripts, you must be sure to explicitly build targe
306306
host platform (in this case, `x86_64-unknown-linux-gnu`).
307307

308308
If you want to always build for other targets without needing to pass flags to `x build`,
309-
you can configure this in the `[build]` section of your `config.toml` like so:
309+
you can configure this in the `[build]` section of your `bootstrap.toml` like so:
310310

311311
```toml
312312
[build]
@@ -316,8 +316,8 @@ target = ["x86_64-unknown-linux-gnu", "wasm32-wasip1"]
316316
Note that building for some targets requires having external dependencies installed
317317
(e.g. building musl targets requires a local copy of musl).
318318
Any target-specific configuration (e.g. the path to a local copy of musl)
319-
will need to be provided by your `config.toml`.
320-
Please see `config.example.toml` for information on target-specific configuration keys.
319+
will need to be provided by your `bootstrap.toml`.
320+
Please see `bootstrap.example.toml` for information on target-specific configuration keys.
321321

322322
For examples of the complete configuration necessary to build a target, please visit
323323
[the rustc book](https://doc.rust-lang.org/rustc/platform-support.html),

src/building/new-target.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ able to configure Rust to treat your build as the system LLVM to avoid
3333
redundant builds.
3434

3535
You can tell Rust to use a pre-built version of LLVM using the `target` section
36-
of `config.toml`:
36+
of `bootstrap.toml`:
3737

3838
```toml
3939
[target.x86_64-unknown-linux-gnu]
@@ -51,8 +51,8 @@ for codegen tests. This tool is normally built with LLVM, but if you use your
5151
own preinstalled LLVM, you will need to provide `FileCheck` in some other way.
5252
On Debian-based systems, you can install the `llvm-N-tools` package (where `N`
5353
is the LLVM version number, e.g. `llvm-8-tools`). Alternately, you can specify
54-
the path to `FileCheck` with the `llvm-filecheck` config item in `config.toml`
55-
or you can disable codegen test with the `codegen-tests` item in `config.toml`.
54+
the path to `FileCheck` with the `llvm-filecheck` config item in `bootstrap.toml`
55+
or you can disable codegen test with the `codegen-tests` item in `bootstrap.toml`.
5656

5757
## Creating a target specification
5858

@@ -137,7 +137,7 @@ After this, run `cargo update -p libc` to update the lockfiles.
137137

138138
Beware that if you patch to a local `path` dependency, this will enable
139139
warnings for that dependency. Some dependencies are not warning-free, and due
140-
to the `deny-warnings` setting in `config.toml`, the build may suddenly start
140+
to the `deny-warnings` setting in `bootstrap.toml`, the build may suddenly start
141141
to fail. To work around the warnings, you may want to disable `deny-warnings`
142142
in the config, or modify the dependency to remove the warnings.
143143

src/building/optimized-build.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This page describes how you can use these approaches when building `rustc` yours
1313

1414
Link-time optimization is a powerful compiler technique that can increase program performance. To
1515
enable (Thin-)LTO when building `rustc`, set the `rust.lto` config option to `"thin"`
16-
in `config.toml`:
16+
in `bootstrap.toml`:
1717

1818
```toml
1919
[rust]
@@ -34,7 +34,7 @@ Enabling LTO on Linux has [produced] speed-ups by up to 10%.
3434

3535
Using a different memory allocator for `rustc` can provide significant performance benefits. If you
3636
want to enable the `jemalloc` allocator, you can set the `rust.jemalloc` option to `true`
37-
in `config.toml`:
37+
in `bootstrap.toml`:
3838

3939
```toml
4040
[rust]
@@ -46,7 +46,7 @@ jemalloc = true
4646
## Codegen units
4747

4848
Reducing the amount of codegen units per `rustc` crate can produce a faster build of the compiler.
49-
You can modify the number of codegen units for `rustc` and `libstd` in `config.toml` with the
49+
You can modify the number of codegen units for `rustc` and `libstd` in `bootstrap.toml` with the
5050
following options:
5151

5252
```toml
@@ -67,7 +67,7 @@ RUSTFLAGS="-C target_cpu=x86-64-v3" ./x build ...
6767
```
6868

6969
If you also want to compile LLVM for a specific instruction set, you can set `llvm` flags
70-
in `config.toml`:
70+
in `bootstrap.toml`:
7171

7272
```toml
7373
[llvm]

src/building/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ incremental compilation ([see here][config]). This will make compilation take
3838
longer (especially after a rebase), but will save a ton of space from the
3939
incremental caches.
4040

41-
[config]: ./how-to-build-and-run.md#create-a-configtoml
41+
[config]: ./how-to-build-and-run.md#create-a-bootstraptoml

src/building/suggested.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ time in subsequent rebuilds:
207207
```
208208

209209
If you don't want to include the flag with every command, you can
210-
enable it in the `config.toml`:
210+
enable it in the `bootstrap.toml`:
211211

212212
```toml
213213
[rust]
@@ -293,20 +293,20 @@ pkgs.mkShell {
293293
```
294294

295295
Note that when using nix on a not-NixOS distribution, it may be necessary to set
296-
**`patch-binaries-for-nix = true` in `config.toml`**.
296+
**`patch-binaries-for-nix = true` in `bootstrap.toml`**.
297297
Bootstrap tries to detect whether it's running in nix and enable patching automatically,
298298
but this detection can have false negatives.
299299

300-
You can also use your nix shell to manage `config.toml`:
300+
You can also use your nix shell to manage `bootstrap.toml`:
301301

302302
```nix
303303
let
304304
config = pkgs.writeText "rustc-config" ''
305-
# Your config.toml content goes here
305+
# Your bootstrap.toml content goes here
306306
''
307307
pkgs.mkShell {
308308
/* ... */
309-
# This environment variable tells bootstrap where our config.toml is.
309+
# This environment variable tells bootstrap where our bootstrap.toml is.
310310
RUST_BOOTSTRAP_CONFIG = config;
311311
}
312312
```

src/compiler-debugging.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ chapter](./backend/debugging.md)).
1111
## Configuring the compiler
1212

1313
By default, rustc is built without most debug information. To enable debug info,
14-
set `debug = true` in your config.toml.
14+
set `debug = true` in your bootstrap.toml.
1515

1616
Setting `debug = true` turns on many different debug options (e.g., `debug-assertions`,
1717
`debug-logging`, etc.) which can be individually tweaked if you want to, but many people
1818
simply set `debug = true`.
1919

20-
If you want to use GDB to debug rustc, please set `config.toml` with options:
20+
If you want to use GDB to debug rustc, please set `bootstrap.toml` with options:
2121

2222
```toml
2323
[rust]
@@ -35,14 +35,14 @@ debuginfo-level = 2
3535
3636
The default configuration will enable `symbol-mangling-version` v0.
3737
This requires at least GDB v10.2,
38-
otherwise you need to disable new symbol-mangling-version in `config.toml`.
38+
otherwise you need to disable new symbol-mangling-version in `bootstrap.toml`.
3939

4040
```toml
4141
[rust]
4242
new-symbol-mangling = false
4343
```
4444

45-
> See the comments in `config.example.toml` for more info.
45+
> See the comments in `bootstrap.example.toml` for more info.
4646
4747
You will need to rebuild the compiler after changing any configuration option.
4848

@@ -335,7 +335,7 @@ error: aborting due to previous error
335335

336336
## Configuring CodeLLDB for debugging `rustc`
337337

338-
If you are using VSCode, and have edited your `config.toml` to request debugging
338+
If you are using VSCode, and have edited your `bootstrap.toml` to request debugging
339339
level 1 or 2 for the parts of the code you're interested in, then you should be
340340
able to use the [CodeLLDB] extension in VSCode to debug it.
341341

src/fuzzing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ what actually results in superior throughput.
123123
You may want to build rustc from source with debug assertions to find
124124
additional bugs, though this is a trade-off: it can slow down fuzzing by
125125
requiring extra work for every execution. To enable debug assertions, add this
126-
to `config.toml` when compiling rustc:
126+
to `bootstrap.toml` when compiling rustc:
127127

128128
```toml
129129
[rust]

src/llvm-coverage-instrumentation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Detailed instructions and examples are documented in the
3434
[coverage map]: https://llvm.org/docs/CoverageMappingFormat.html
3535
[rustc-book-instrument-coverage]: https://doc.rust-lang.org/nightly/rustc/instrument-coverage.html
3636

37-
## Recommended `config.toml` settings
37+
## Recommended `bootstrap.toml` settings
3838

3939
When working on the coverage instrumentation code, it is usually necessary to
4040
**enable the profiler runtime** by setting `profiler = true` in `[build]`.
@@ -85,7 +85,7 @@ statically links coverage-instrumented binaries with LLVM runtime code
8585
In the `rustc` source tree,
8686
`library/profiler_builtins` bundles the LLVM `compiler-rt` code into a Rust library crate.
8787
Note that when building `rustc`,
88-
`profiler_builtins` is only included when `build.profiler = true` is set in `config.toml`.
88+
`profiler_builtins` is only included when `build.profiler = true` is set in `bootstrap.toml`.
8989

9090
When compiling with `-C instrument-coverage`,
9191
[`CrateLoader::postprocess()`][crate-loader-postprocess] dynamically loads
@@ -319,7 +319,7 @@ human-readable coverage report.
319319

320320
> Tests in `coverage-run` mode have an implicit `// needs-profiler-support`
321321
> directive, so they will be skipped if the profiler runtime has not been
322-
> [enabled in `config.toml`](#recommended-configtoml-settings).
322+
> [enabled in `bootstrap.toml`](#recommended-bootstraptoml-settings).
323323
324324
Finally, the [`coverage-llvmir`] test compiles a simple Rust program
325325
with `-C instrument-coverage` and compares the compiled program's LLVM IR to

src/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ approach is to turn [`RefCell`]s into [`Mutex`]s -- that is, we
351351
switch to thread-safe internal mutability. However, there are ongoing
352352
challenges with lock contention, maintaining query-system invariants under
353353
concurrency, and the complexity of the code base. One can try out the current
354-
work by enabling parallel compilation in `config.toml`. It's still early days,
354+
work by enabling parallel compilation in `bootstrap.toml`. It's still early days,
355355
but there are already some promising performance improvements.
356356

357357
[`RefCell`]: https://doc.rust-lang.org/std/cell/struct.RefCell.html

src/parallel-rustc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parallel implementations, such as query evaluation, type check and
66
monomorphization, but the general version of the compiler does not include
77
these parallelization functions. **To try out the current parallel compiler**,
88
one can install rustc from source code with `parallel-compiler = true` in
9-
the `config.toml`.
9+
the `bootstrap.toml`.
1010

1111
The lack of parallelism at other stages (for example, macro expansion) also
1212
represents an opportunity for improving compiler performance.

src/profile-guided-optimization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The `rustc` version of this can be found in `library/profiler_builtins` which
120120
basically packs the C code from `compiler-rt` into a Rust crate.
121121

122122
In order for `profiler_builtins` to be built, `profiler = true` must be set
123-
in `rustc`'s `config.toml`.
123+
in `rustc`'s `bootstrap.toml`.
124124

125125
[compiler-rt-profile]: https://github.com/llvm/llvm-project/tree/main/compiler-rt/lib/profile
126126

src/profiling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Example output for the compiler:
8787

8888
Since this doesn't seem to work with incremental compilation or `./x check`,
8989
you will be compiling rustc _a lot_.
90-
I recommend changing a few settings in `config.toml` to make it bearable:
90+
I recommend changing a few settings in `bootstrap.toml` to make it bearable:
9191
```
9292
[rust]
9393
# A debug build takes _a third_ as long on my machine,

src/profiling/with_perf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is a guide for how to profile rustc with [perf](https://perf.wiki.kernel.or
66

77
- Get a clean checkout of rust-lang/master, or whatever it is you want
88
to profile.
9-
- Set the following settings in your `config.toml`:
9+
- Set the following settings in your `bootstrap.toml`:
1010
- `debuginfo-level = 1` - enables line debuginfo
1111
- `jemalloc = false` - lets you do memory use profiling with valgrind
1212
- leave everything else the defaults

src/profiling/wpa_profiling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ compiler we're using to build rustc will aid our analysis greatly by allowing WP
4444
symbols correctly. Unfortunately, the stage 0 compiler does not have symbols turned on which is why
4545
we'll need to build a stage 1 compiler and then a stage 2 compiler ourselves.
4646

47-
To do this, make sure you have set `debuginfo-level = 1` in your `config.toml` file. This tells
47+
To do this, make sure you have set `debuginfo-level = 1` in your `bootstrap.toml` file. This tells
4848
rustc to generate debug information which includes stack frames when bootstrapping.
4949

5050
Now you can build the stage 1 compiler: `x build --stage 1 -i library` or however

src/sanitizers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ implementation:
3232

3333
* The sanitizer runtime libraries are part of the [compiler-rt] project, and
3434
[will be built][sanitizer-build] on [supported targets][sanitizer-targets]
35-
when enabled in `config.toml`:
35+
when enabled in `bootstrap.toml`:
3636

3737
```toml
3838
[build]
@@ -80,7 +80,7 @@ Sanitizers are validated by code generation tests in
8080
[`tests/ui/sanitize/`][test-ui] directory.
8181

8282
Testing sanitizer functionality requires the sanitizer runtimes (built when
83-
`sanitizer = true` in `config.toml`) and target providing support for particular
83+
`sanitizer = true` in `bootstrap.toml`) and target providing support for particular
8484
sanitizer. When sanitizer is unsupported on given target, sanitizers tests will
8585
be ignored. This behaviour is controlled by compiletest `needs-sanitizer-*`
8686
directives.

src/tests/compiletest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,10 @@ human-readable code coverage report.
491491

492492
Instrumented binaries need to be linked against the LLVM profiler runtime,
493493
so `coverage-run` tests are **automatically skipped**
494-
unless the profiler runtime is enabled in `config.toml`:
494+
unless the profiler runtime is enabled in `bootstrap.toml`:
495495

496496
```toml
497-
# config.toml
497+
# bootstrap.toml
498498
[build]
499499
profiler = true
500500
```

src/tests/docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Alternatively, you can run individual commands to do specific tasks. For
2424
example, you can run `../x test tests/ui` to just run UI tests.
2525
Note that there is some configuration in the [`src/ci/run.sh`] script that you
2626
may need to recreate. Particularly, set `submodules = false` in your
27-
`config.toml` so that it doesn't attempt to modify the read-only directory.
27+
`bootstrap.toml` so that it doesn't attempt to modify the read-only directory.
2828

2929
Some additional notes about using the Docker images:
3030

src/tests/headers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ The following header commands will check rustc build settings and target setting
150150
* `needs-asm-support` — ignores if it is running on a target that doesn't have
151151
stable support for `asm!`
152152
* `needs-profiler-support` — ignores if profiler support was not enabled for
153-
the target (`profiler = true` in rustc's `config.toml`)
153+
the target (`profiler = true` in rustc's `bootstrap.toml`)
154154
* `needs-sanitizer-support` — ignores if the sanitizer support was not enabled
155-
for the target (`sanitizers = true` in rustc's `config.toml`)
155+
for the target (`sanitizers = true` in rustc's `bootstrap.toml`)
156156
* `needs-sanitizer-{address,hwaddress,leak,memory,thread}` — ignores
157157
if the corresponding sanitizer is not enabled for the target
158158
(AddressSanitizer, hardware-assisted AddressSanitizer, LeakSanitizer,
@@ -162,7 +162,7 @@ The following header commands will check rustc build settings and target setting
162162
--run=never` flag, or running on fuchsia.
163163
* `needs-unwind` — ignores if the target does not support unwinding
164164
* `needs-rust-lld` — ignores if the rust lld support is not enabled
165-
(`rust.lld = true` in `config.toml`)
165+
(`rust.lld = true` in `bootstrap.toml`)
166166
* `needs-threads` — ignores if the target does not have threading support
167167
* `needs-symlink` — ignores if the target does not support symlinks. This can be the case on Windows
168168
if the developer did not enable priviledged symlink permissions.

src/tests/running.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ all tests. Of course you can also target just specific tests with the
160160

161161
There are a few options for running tests:
162162

163-
* `config.toml` has the `rust.verbose-tests` option.
163+
* `bootstrap.toml` has the `rust.verbose-tests` option.
164164
If `false`, each test will print a single dot (the default).
165165
If `true`, the name of every test will be printed.
166166
This is equivalent to the `--quiet` option in the [Rust test
@@ -341,7 +341,7 @@ communicate with the server to coordinate running tests (see
341341
First thing to know is that it only supports linux x86_64 at the moment. We will
342342
extend its support later on.
343343

344-
You need to update `codegen-backends` value in your `config.toml` file in the
344+
You need to update `codegen-backends` value in your `bootstrap.toml` file in the
345345
`[rust]` section and add "gcc" in the array:
346346

347347
```toml

0 commit comments

Comments
 (0)