Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

interpret/validity: remove unreachable error kind

Browse Source
This commit is contained in:
Ralf Jung
2026-03-22 17:36:39 +01:00
parent e52f547ed4
commit be8dee1141
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_const_eval/src/interpret/validity.rs
+6 -5
View File
@@ -128,7 +128,6 @@ enum ExpectedKind {
Reference,
Box,
RawPtr,
InitScalar,
Bool,
Char,
Float,
@@ -143,7 +142,6 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
ExpectedKind::Reference => "expected a reference",
ExpectedKind::Box => "expected a box",
ExpectedKind::RawPtr => "expected a raw pointer",
ExpectedKind::InitScalar => "expected initialized scalar value",
ExpectedKind::Bool => "expected a boolean",
ExpectedKind::Char => "expected a unicode scalar value",
ExpectedKind::Float => "expected a floating point number",
@@ -1478,7 +1476,9 @@ fn visit_value(&mut self, val: &PlaceTy<'tcx, M::Provenance>) -> InterpResult<'t
BackendRepr::Scalar(scalar_layout) => {
if !scalar_layout.is_uninit_valid() {
// There is something to check here.
let scalar = self.read_scalar(val, ExpectedKind::InitScalar)?;
// We read directly via `ecx` since the read cannot fail -- we already read
// this field above when recursing into the field.
let scalar = self.ecx.read_scalar(val)?;
self.visit_scalar(scalar, scalar_layout)?;
}
}
@@ -1487,8 +1487,9 @@ fn visit_value(&mut self, val: &PlaceTy<'tcx, M::Provenance>) -> InterpResult<'t
// FIXME: find a way to also check ScalarPair when one side can be uninit but
// the other must be init.
if !a_layout.is_uninit_valid() && !b_layout.is_uninit_valid() {
let (a, b) =
self.read_immediate(val, ExpectedKind::InitScalar)?.to_scalar_pair();
// We read directly via `ecx` since the read cannot fail -- we already read
// this field above when recursing into the field.
let (a, b) = self.ecx.read_immediate(val)?.to_scalar_pair();
self.visit_scalar(a, a_layout)?;
self.visit_scalar(b, b_layout)?;
}