diff options
| author | bors <bors@rust-lang.org> | 2024-11-18 12:46:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-18 12:46:07 +0000 |
| commit | c602e9aeaab636302d52b17da64e84044462a230 (patch) | |
| tree | 04f28fc278cc8bf2604d55d2a10ea5b08555d8fe /compiler/rustc_const_eval/src | |
| parent | e83c45a98bf8c8228fb60e55a1cb75b8e69b5c1b (diff) | |
| parent | 194c76ef0a6db5f83d7bf6eef6b67a0e1f73dcc0 (diff) | |
| download | rust-c602e9aeaab636302d52b17da64e84044462a230.tar.gz rust-c602e9aeaab636302d52b17da64e84044462a230.zip | |
Auto merge of #133160 - jhpratt:rollup-wzj9q15, r=jhpratt
Rollup of 4 pull requests Successful merges: - #132934 (Overhaul the `-l` option parser (for linking to native libs)) - #133142 (rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect) - #133145 (Document alternatives to `static mut`) - #133158 (Subtree update of `rust-analyzer`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/check_consts/check.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/check_consts/check.rs b/compiler/rustc_const_eval/src/check_consts/check.rs index ffe32acb316..b6664606ef9 100644 --- a/compiler/rustc_const_eval/src/check_consts/check.rs +++ b/compiler/rustc_const_eval/src/check_consts/check.rs @@ -760,7 +760,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> { Some(ConstStability { level: StabilityLevel::Stable { .. }, .. }) => { // All good. Note that a `#[rustc_const_stable]` intrinsic (meaning it // can be *directly* invoked from stable const code) does not always - // have the `#[rustc_const_stable_intrinsic]` attribute (which controls + // have the `#[rustc_intrinsic_const_stable_indirect]` attribute (which controls // exposing an intrinsic indirectly); we accept this call anyway. } } |
