diff options
| author | bors <bors@rust-lang.org> | 2024-02-16 16:40:45 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-16 16:40:45 +0000 | 
| commit | d2e8ecd8bd26a22111cdebfb813258450b07fbf0 (patch) | |
| tree | afe320e52e840709dbf49a51d1dee3ecd70b6469 /compiler/rustc_middle/src/mir/interpret/error.rs | |
| parent | ae9d7b0c6434b27e4e2effe8f05b16d37e7ef33f (diff) | |
| parent | f82875e2425c565db12643a562e60c0f08b28c87 (diff) | |
| download | rust-d2e8ecd8bd26a22111cdebfb813258450b07fbf0.tar.gz rust-d2e8ecd8bd26a22111cdebfb813258450b07fbf0.zip | |
Auto merge of #121188 - GuillaumeGomez:rollup-bejz7fq, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #119928 (suggest `into_iter()` when `Iterator` method called on `impl IntoIterator`) - #121020 (Avoid an ICE in diagnostics) - #121111 (For E0038, suggest associated type if available) - #121137 (Add clippy into the known `cfg` list) - #121179 (allow mutable references in const values when they point to no memory) - #121181 (Fix an ICE in the recursion lint) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src/mir/interpret/error.rs')
| -rw-r--r-- | compiler/rustc_middle/src/mir/interpret/error.rs | 9 | 
1 files changed, 5 insertions, 4 deletions
| diff --git a/compiler/rustc_middle/src/mir/interpret/error.rs b/compiler/rustc_middle/src/mir/interpret/error.rs index 9d4ec7d25bb..125fac48df8 100644 --- a/compiler/rustc_middle/src/mir/interpret/error.rs +++ b/compiler/rustc_middle/src/mir/interpret/error.rs @@ -12,6 +12,7 @@ use rustc_macros::HashStable; use rustc_session::CtfeBacktrace; use rustc_span::{def_id::DefId, Span, DUMMY_SP}; use rustc_target::abi::{call, Align, Size, VariantIdx, WrappingRange}; +use rustc_type_ir::Mutability; use std::borrow::Cow; use std::{any::Any, backtrace::Backtrace, fmt}; @@ -367,7 +368,7 @@ pub enum UndefinedBehaviorInfo<'tcx> { #[derive(Debug, Clone, Copy)] pub enum PointerKind { - Ref, + Ref(Mutability), Box, } @@ -375,7 +376,7 @@ impl IntoDiagnosticArg for PointerKind { fn into_diagnostic_arg(self) -> DiagnosticArgValue { DiagnosticArgValue::Str( match self { - Self::Ref => "ref", + Self::Ref(_) => "ref", Self::Box => "box", } .into(), @@ -408,7 +409,7 @@ impl From<PointerKind> for ExpectedKind { fn from(x: PointerKind) -> ExpectedKind { match x { PointerKind::Box => ExpectedKind::Box, - PointerKind::Ref => ExpectedKind::Reference, + PointerKind::Ref(_) => ExpectedKind::Reference, } } } @@ -419,7 +420,7 @@ pub enum ValidationErrorKind<'tcx> { PartialPointer, PtrToUninhabited { ptr_kind: PointerKind, ty: Ty<'tcx> }, PtrToStatic { ptr_kind: PointerKind }, - MutableRefInConst, + MutableRefInConstOrStatic, ConstRefToMutable, ConstRefToExtern, MutableRefToImmutable, | 
