diff options
| author | bors <bors@rust-lang.org> | 2023-06-30 22:40:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-30 22:40:34 +0000 |
| commit | e013d8f8b3984ed2409e489f5d5183a0e3d091cf (patch) | |
| tree | 5b2e39cc6f1ff0d92181ab269909536a0f091c9a /src/bootstrap | |
| parent | f4b80cacf93ca216c75f6ae12f4b9dec19eba42f (diff) | |
| parent | 58a61eea89de061ed707b449fbcfc8b4150bac7e (diff) | |
Auto merge of #113216 - matthiaskrgr:rollup-8xe65sj, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #113072 (str docs: remove "Basic usage" text where not useful) - #113153 (make HashMap::or_insert_with example more simple) - #113185 (Set `channel = nightly` in dist profile) - #113186 (document that the panic in collect_intra_doc_links is load-bearing) - #113187 (No need to distinguish `LocalTy` from `Ty`) - #113189 (compiletest: Only trim the end of process output) - #113191 (Update browser-ui-test version and improve GUI test) - #113206 (User may want to skip tidy check sometimes) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/defaults/config.dist.toml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/defaults/config.dist.toml b/src/bootstrap/defaults/config.dist.toml index 25d9e649f23..44efdf50b96 100644 --- a/src/bootstrap/defaults/config.dist.toml +++ b/src/bootstrap/defaults/config.dist.toml @@ -12,6 +12,9 @@ extended = true [llvm] download-ci-llvm = false [rust] +# We have several defaults in bootstrap that depend on whether the channel is `dev` (e.g. `omit-git-hash` and `download-ci-llvm`). +# Make sure they don't get set when installing from source. +channel = "nightly" download-rustc = false [dist] |