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 /compiler | |
| parent | 4f1be92153167dfc2a54215bfd49f398c04ce647 (diff) | |
| parent | 4b6f838e5638fe34c056e6f5948edb42b59dd3bc (diff) | |
| download | rust-bc486f31a69f817ebdef82a968ef6a0db6d3a4fc.tar.gz rust-bc486f31a69f817ebdef82a968ef6a0db6d3a4fc.zip | |
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 'compiler')
| -rw-r--r-- | compiler/rustc_lint/src/if_let_rescope.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_lint_defs/src/builtin.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_lint/src/if_let_rescope.rs b/compiler/rustc_lint/src/if_let_rescope.rs index 5b65541bea6..7138d40a48f 100644 --- a/compiler/rustc_lint/src/if_let_rescope.rs +++ b/compiler/rustc_lint/src/if_let_rescope.rs @@ -24,7 +24,7 @@ declare_lint! { /// ### Example /// /// ```rust,edition2021 - /// #![feature(if_let_rescope)] + /// #![cfg_attr(not(bootstrap), feature(if_let_rescope))] // Simplify this in bootstrap bump. /// #![warn(if_let_rescope)] /// #![allow(unused_variables)] /// diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs index f42f35c594b..9b6d63c2ef4 100644 --- a/compiler/rustc_lint_defs/src/builtin.rs +++ b/compiler/rustc_lint_defs/src/builtin.rs @@ -1870,6 +1870,7 @@ declare_lint! { /// ### Example /// /// ```rust,compile_fail + /// # #[cfg_attr(bootstrap)] compile_error!(); // Remove this in bootstrap bump. /// #![deny(elided_named_lifetimes)] /// struct Foo; /// impl Foo { |