diff options
| author | bors <bors@rust-lang.org> | 2024-09-15 05:15:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-15 05:15:25 +0000 |
| commit | bc486f31a69f817ebdef82a968ef6a0db6d3a4fc (patch) | |
| tree | 603e0fea0c3687452acf66002e6e78be148c95ad /src | |
| parent | 4f1be92153167dfc2a54215bfd49f398c04ce647 (diff) | |
| parent | 4b6f838e5638fe34c056e6f5948edb42b59dd3bc (diff) | |
Auto merge of #130379 - Zalathar:rollup-wpmcnql, r=Zalathar
Rollup of 6 pull requests Successful merges: - #130042 (properly handle EOF in BufReader::peek) - #130061 (Add `NonNull` convenience methods to `Box` and `Vec`) - #130202 (set `download-ci-llvm = true` by default on "library" and "tools" profiles) - #130214 (MaybeUninit::zeroed: mention that padding is not zeroed) - #130353 (Make some lint doctests compatible with `--stage=0`) - #130370 (unstable-book: `trait_upcasting` example should not have `#![allow(incomplete_features)]`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/defaults/config.library.toml | 3 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.tools.toml | 3 | ||||
| -rw-r--r-- | src/bootstrap/src/utils/change_tracker.rs | 5 | ||||
| -rw-r--r-- | src/doc/unstable-book/src/language-features/trait-upcasting.md | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/bootstrap/defaults/config.library.toml b/src/bootstrap/defaults/config.library.toml index 087544397f5..5447565a4b0 100644 --- a/src/bootstrap/defaults/config.library.toml +++ b/src/bootstrap/defaults/config.library.toml @@ -13,4 +13,5 @@ lto = "off" [llvm] # Will download LLVM from CI if available on your platform. -download-ci-llvm = "if-unchanged" +# If you intend to modify `src/llvm-project`, use `"if-unchanged"` or `false` instead. +download-ci-llvm = true diff --git a/src/bootstrap/defaults/config.tools.toml b/src/bootstrap/defaults/config.tools.toml index 75ad37ce335..efb56996bcd 100644 --- a/src/bootstrap/defaults/config.tools.toml +++ b/src/bootstrap/defaults/config.tools.toml @@ -17,4 +17,5 @@ compiler-docs = true [llvm] # Will download LLVM from CI if available on your platform. -download-ci-llvm = "if-unchanged" +# If you intend to modify `src/llvm-project`, use `"if-unchanged"` or `false` instead. +download-ci-llvm = true diff --git a/src/bootstrap/src/utils/change_tracker.rs b/src/bootstrap/src/utils/change_tracker.rs index 99bcc6e0787..bedaa15ccb9 100644 --- a/src/bootstrap/src/utils/change_tracker.rs +++ b/src/bootstrap/src/utils/change_tracker.rs @@ -255,4 +255,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[ severity: ChangeSeverity::Warning, summary: "`download-ci-llvm = true` now checks if CI llvm is available and has become the default for the compiler profile", }, + ChangeInfo { + change_id: 130202, + severity: ChangeSeverity::Info, + summary: "'tools' and 'library' profiles switched `download-ci-llvm` option from `if-unchanged` to `true`.", + }, ]; diff --git a/src/doc/unstable-book/src/language-features/trait-upcasting.md b/src/doc/unstable-book/src/language-features/trait-upcasting.md index 3697ae38f9d..a5f99cc86f2 100644 --- a/src/doc/unstable-book/src/language-features/trait-upcasting.md +++ b/src/doc/unstable-book/src/language-features/trait-upcasting.md @@ -12,7 +12,6 @@ so long as `Bar: Foo`. ```rust,edition2018 #![feature(trait_upcasting)] -#![allow(incomplete_features)] trait Foo {} |
