Skip to content

12 files changed

+16
-17
lines changed
 

‎.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
src/etc/installer/gfx/* binary
1010
src/vendor/** -text
1111
Cargo.lock linguist-generated=false
12-
config.toml.example linguist-language=TOML
1312

1413
# Older git versions try to fix line endings on images and fonts, this prevents it.
1514
*.png binary

‎.reuse/dep5

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Files: compiler/*
1616
Cargo.lock
1717
Cargo.toml
1818
CODE_OF_CONDUCT.md
19-
config.toml.example
19+
config.example.toml
2020
configure
2121
CONTRIBUTING.md
2222
COPYRIGHT

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ See [the rustc-dev-guide for more info][sysllvm].
9999
The Rust build system uses a file named `config.toml` in the root of the
100100
source tree to determine various configuration settings for the build.
101101
Set up the defaults intended for distros to get started. You can see a full
102-
list of options in `config.toml.example`.
102+
list of options in `config.example.toml`.
103103

104104
```sh
105105
printf 'profile = "user" \nchangelog-seen = 2 \n' > config.toml
File renamed without changes.

‎src/bootstrap/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Some general areas that you may be interested in modifying are:
185185
If you make a major change, please remember to:
186186

187187
+ Update `VERSION` in `src/bootstrap/main.rs`.
188-
* Update `changelog-seen = N` in `config.toml.example`.
188+
* Update `changelog-seen = N` in `config.example.toml`.
189189
* Add an entry in `src/bootstrap/CHANGELOG.md`.
190190

191191
A 'major change' includes

‎src/bootstrap/bin/main.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ fn main() {
4444
if suggest_setup {
4545
println!("warning: you have not made a `config.toml`");
4646
println!(
47-
"help: consider running `./x.py setup` or copying `config.toml.example` by running \
48-
`cp config.toml.example config.toml`"
47+
"help: consider running `./x.py setup` or copying `config.example.toml` by running \
48+
`cp config.example.toml config.toml`"
4949
);
5050
} else if let Some(suggestion) = &changelog_suggestion {
5151
println!("{}", suggestion);
@@ -57,8 +57,8 @@ fn main() {
5757
if suggest_setup {
5858
println!("warning: you have not made a `config.toml`");
5959
println!(
60-
"help: consider running `./x.py setup` or copying `config.toml.example` by running \
61-
`cp config.toml.example config.toml`"
60+
"help: consider running `./x.py setup` or copying `config.example.toml` by running \
61+
`cp config.example.toml config.toml`"
6262
);
6363
} else if let Some(suggestion) = &changelog_suggestion {
6464
println!("{}", suggestion);

‎src/bootstrap/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub enum DryRun {
5555
/// Note that this structure is not decoded directly into, but rather it is
5656
/// filled out from the decoded forms of the structs below. For documentation
5757
/// each field, see the corresponding fields in
58-
/// `config.toml.example`.
58+
/// `config.example.toml`.
5959
#[derive(Default)]
6060
#[cfg_attr(test, derive(Clone))]
6161
pub struct Config {
@@ -325,7 +325,7 @@ impl std::str::FromStr for SplitDebuginfo {
325325

326326
impl SplitDebuginfo {
327327
/// Returns the default `-Csplit-debuginfo` value for the current target. See the comment for
328-
/// `rust.split-debuginfo` in `config.toml.example`.
328+
/// `rust.split-debuginfo` in `config.example.toml`.
329329
fn default_for_platform(target: &str) -> Self {
330330
if target.contains("apple") {
331331
SplitDebuginfo::Unpacked

‎src/bootstrap/configure.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def err(msg):
194194
print('')
195195
print('This configure script is a thin configuration shim over the true')
196196
print('configuration system, `config.toml`. You can explore the comments')
197-
print('in `config.toml.example` next to this configure script to see')
197+
print('in `config.example.toml` next to this configure script to see')
198198
print('more information about what each option is. Additionally you can')
199199
print('pass `--set` as an argument to set arbitrary key/value pairs')
200200
print('in the TOML configuration if desired')
@@ -367,7 +367,7 @@ def set(key, value):
367367

368368
set('build.configure-args', sys.argv[1:])
369369

370-
# "Parse" the `config.toml.example` file into the various sections, and we'll
370+
# "Parse" the `config.example.toml` file into the various sections, and we'll
371371
# use this as a template of a `config.toml` to write out which preserves
372372
# all the various comments and whatnot.
373373
#
@@ -380,7 +380,7 @@ def set(key, value):
380380
targets = {}
381381
top_level_keys = []
382382

383-
for line in open(rust_dir + '/config.toml.example').read().split("\n"):
383+
for line in open(rust_dir + '/config.example.toml').read().split("\n"):
384384
if cur_section == None:
385385
if line.count('=') == 1:
386386
top_level_key = line.split('=')[0]

‎src/bootstrap/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ impl Step for PlainSourceTarball {
967967
"RELEASES.md",
968968
"configure",
969969
"x.py",
970-
"config.toml.example",
970+
"config.example.toml",
971971
"Cargo.toml",
972972
"Cargo.lock",
973973
];

‎src/bootstrap/native.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ impl Step for Llvm {
286286
(true, true) => "RelWithDebInfo",
287287
};
288288

289-
// NOTE: remember to also update `config.toml.example` when changing the
289+
// NOTE: remember to also update `config.example.toml` when changing the
290290
// defaults!
291291
let llvm_targets = match &builder.config.llvm_targets {
292292
Some(s) => s,

‎src/doc/rustc/src/instrument-coverage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Rust's source-based code coverage requires the Rust "profiler runtime". Without
3131

3232
The Rust `nightly` distribution channel includes the profiler runtime, by default.
3333

34-
> **Important**: If you are building the Rust compiler from the source distribution, the profiler runtime is _not_ enabled in the default `config.toml.example`. Edit your `config.toml` file and ensure the `profiler` feature is set it to `true` (either under the `[build]` section, or under the settings for an individual `[target.<triple>]`):
34+
> **Important**: If you are building the Rust compiler from the source distribution, the profiler runtime is _not_ enabled in the default `config.example.toml`. Edit your `config.toml` file and ensure the `profiler` feature is set it to `true` (either under the `[build]` section, or under the settings for an individual `[target.<triple>]`):
3535
>
3636
> ```toml
3737
> # Build the profiler runtime (required when compiling with options that depend

‎triagebot.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ trigger_files = [
185185
"src/tools/x",
186186
"configure",
187187
"Cargo.toml",
188-
"config.toml.example",
188+
"config.example.toml",
189189
"src/stage0.json"
190190
]
191191

0 commit comments

Comments
 (0)
Please sign in to comment.