File tree Expand file tree Collapse file tree 12 files changed +16
-17
lines changed Expand file tree Collapse file tree 12 files changed +16
-17
lines changed Original file line number Diff line number Diff line change 9
9
src /etc /installer /gfx /* binary
10
10
src /vendor /** - text
11
11
Cargo.lock linguist-generated =false
12
- config.toml.example linguist-language =TOML
13
12
14
13
# Older git versions try to fix line endings on images and fonts, this prevents it.
15
14
* .png binary
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ Files: compiler/*
16
16
Cargo.lock
17
17
Cargo.toml
18
18
CODE_OF_CONDUCT.md
19
- config.toml. example
19
+ config.example.toml
20
20
configure
21
21
CONTRIBUTING.md
22
22
COPYRIGHT
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ See [the rustc-dev-guide for more info][sysllvm].
99
99
The Rust build system uses a file named ` config.toml ` in the root of the
100
100
source tree to determine various configuration settings for the build.
101
101
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 ` .
103
103
104
104
``` sh
105
105
printf ' profile = "user" \nchangelog-seen = 2 \n' > config.toml
File renamed without changes.
Original file line number Diff line number Diff line change @@ -185,7 +185,7 @@ Some general areas that you may be interested in modifying are:
185
185
If you make a major change, please remember to:
186
186
187
187
+ 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 ` .
189
189
* Add an entry in ` src/bootstrap/CHANGELOG.md ` .
190
190
191
191
A 'major change' includes
Original file line number Diff line number Diff line change @@ -44,8 +44,8 @@ fn main() {
44
44
if suggest_setup {
45
45
println ! ( "warning: you have not made a `config.toml`" ) ;
46
46
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`"
49
49
) ;
50
50
} else if let Some ( suggestion) = & changelog_suggestion {
51
51
println ! ( "{}" , suggestion) ;
@@ -57,8 +57,8 @@ fn main() {
57
57
if suggest_setup {
58
58
println ! ( "warning: you have not made a `config.toml`" ) ;
59
59
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`"
62
62
) ;
63
63
} else if let Some ( suggestion) = & changelog_suggestion {
64
64
println ! ( "{}" , suggestion) ;
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ pub enum DryRun {
55
55
/// Note that this structure is not decoded directly into, but rather it is
56
56
/// filled out from the decoded forms of the structs below. For documentation
57
57
/// each field, see the corresponding fields in
58
- /// `config.toml. example`.
58
+ /// `config.example.toml `.
59
59
#[ derive( Default ) ]
60
60
#[ cfg_attr( test, derive( Clone ) ) ]
61
61
pub struct Config {
@@ -325,7 +325,7 @@ impl std::str::FromStr for SplitDebuginfo {
325
325
326
326
impl SplitDebuginfo {
327
327
/// 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 `.
329
329
fn default_for_platform ( target : & str ) -> Self {
330
330
if target. contains ( "apple" ) {
331
331
SplitDebuginfo :: Unpacked
Original file line number Diff line number Diff line change @@ -194,7 +194,7 @@ def err(msg):
194
194
print ('' )
195
195
print ('This configure script is a thin configuration shim over the true' )
196
196
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' )
198
198
print ('more information about what each option is. Additionally you can' )
199
199
print ('pass `--set` as an argument to set arbitrary key/value pairs' )
200
200
print ('in the TOML configuration if desired' )
@@ -367,7 +367,7 @@ def set(key, value):
367
367
368
368
set ('build.configure-args' , sys .argv [1 :])
369
369
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
371
371
# use this as a template of a `config.toml` to write out which preserves
372
372
# all the various comments and whatnot.
373
373
#
@@ -380,7 +380,7 @@ def set(key, value):
380
380
targets = {}
381
381
top_level_keys = []
382
382
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 " ):
384
384
if cur_section == None :
385
385
if line .count ('=' ) == 1 :
386
386
top_level_key = line .split ('=' )[0 ]
Original file line number Diff line number Diff line change @@ -967,7 +967,7 @@ impl Step for PlainSourceTarball {
967
967
"RELEASES.md" ,
968
968
"configure" ,
969
969
"x.py" ,
970
- "config.toml. example" ,
970
+ "config.example.toml " ,
971
971
"Cargo.toml" ,
972
972
"Cargo.lock" ,
973
973
] ;
Original file line number Diff line number Diff line change @@ -286,7 +286,7 @@ impl Step for Llvm {
286
286
( true , true ) => "RelWithDebInfo" ,
287
287
} ;
288
288
289
- // NOTE: remember to also update `config.toml. example` when changing the
289
+ // NOTE: remember to also update `config.example.toml ` when changing the
290
290
// defaults!
291
291
let llvm_targets = match & builder. config . llvm_targets {
292
292
Some ( s) => s,
You can’t perform that action at this time.
0 commit comments