diff options
| author | bors <bors@rust-lang.org> | 2024-10-10 11:00:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-10 11:00:28 +0000 |
| commit | 4cc494bbfe9911d24f3ee521f98d5c6bb7e3ffe8 (patch) | |
| tree | e19d6f2a7cab3a46426146fa6e8edf8c43730f9b /compiler/rustc_const_eval/src/errors.rs | |
| parent | de19f2b73d4fd456be06f299a5d9d8fd622ca298 (diff) | |
| parent | 1c62cff89775b6ab0feb0ed6c888114a64a1798f (diff) | |
| download | rust-4cc494bbfe9911d24f3ee521f98d5c6bb7e3ffe8.tar.gz rust-4cc494bbfe9911d24f3ee521f98d5c6bb7e3ffe8.zip | |
Auto merge of #131495 - matthiaskrgr:rollup-lwf2u4i, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #130625 (Fix a few relative paths in rustc doc) - #131397 (fix/update teach_note from 'escaping mutable ref/ptr' const-check) - #131479 (Apple: Avoid redundant `-Wl,-dylib` flag when linking) - #131480 (Fix hardcoded strip path when cross-compiling from Linux to Darwin) - #131482 (structurally resolve adts and tuples expectations too) - #131484 (Add myself back to review rotation) - #131491 (impossible obligations fast path) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/errors.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/errors.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_const_eval/src/errors.rs b/compiler/rustc_const_eval/src/errors.rs index c60bacb8506..c943236affc 100644 --- a/compiler/rustc_const_eval/src/errors.rs +++ b/compiler/rustc_const_eval/src/errors.rs @@ -118,8 +118,8 @@ pub(crate) struct UnstableConstFn { } #[derive(Diagnostic)] -#[diag(const_eval_unallowed_mutable_refs, code = E0764)] -pub(crate) struct UnallowedMutableRefs { +#[diag(const_eval_mutable_ref_escaping, code = E0764)] +pub(crate) struct MutableRefEscaping { #[primary_span] pub span: Span, pub kind: ConstContext, @@ -128,8 +128,8 @@ pub(crate) struct UnallowedMutableRefs { } #[derive(Diagnostic)] -#[diag(const_eval_unallowed_mutable_raw, code = E0764)] -pub(crate) struct UnallowedMutableRaw { +#[diag(const_eval_mutable_raw_escaping, code = E0764)] +pub(crate) struct MutableRawEscaping { #[primary_span] pub span: Span, pub kind: ConstContext, @@ -181,8 +181,8 @@ pub(crate) struct UnallowedInlineAsm { } #[derive(Diagnostic)] -#[diag(const_eval_interior_mutable_data_refer, code = E0492)] -pub(crate) struct InteriorMutableDataRefer { +#[diag(const_eval_interior_mutable_ref_escaping, code = E0492)] +pub(crate) struct InteriorMutableRefEscaping { #[primary_span] #[label] pub span: Span, |
