Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix clippy (and MIR printing) handling of ConstValue::Indirect slices

Browse source
This commit is contained in:
Ralf Jung 2023-09-12 14:44:38 +02:00
parent b2d5d68c58
commit 477a9b88bf
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clippy_utils/src/consts.rs
View file

@ -671,19 +671,10 @@ pub fn miri_to_const<'tcx>(lcx: &LateContext<'tcx>, result: mir::ConstantKind<'t
ty::RawPtr(_) => Some(Constant::RawPtr(int.assert_bits(int.size()))), ty::RawPtr(_) => Some(Constant::RawPtr(int.assert_bits(int.size()))),
_ => None, _ => None,
}, },
mir::ConstantKind::Val(ConstValue::Slice { data, start, end }, _) => match result.ty().kind() { mir::ConstantKind::Val(cv, _) if matches!(result.ty().kind(), ty::Ref(_, inner_ty, _) if matches!(inner_ty.kind(), ty::Str)) => {
ty::Ref(_, tam, _) => match tam.kind() { let data = cv.try_get_slice_bytes_for_diagnostics(lcx.tcx)?;
ty::Str => String::from_utf8( String::from_utf8(data.to_owned()).ok().map(Constant::Str)
data.inner() }
.inspect_with_uninit_and_ptr_outside_interpreter(start..end)
.to_owned(),
)
.ok()
.map(Constant::Str),
_ => None,
},
_ => None,
},
mir::ConstantKind::Val(ConstValue::Indirect { alloc_id, offset: _ }, _) => { mir::ConstantKind::Val(ConstValue::Indirect { alloc_id, offset: _ }, _) => {
let alloc = lcx.tcx.global_alloc(alloc_id).unwrap_memory(); let alloc = lcx.tcx.global_alloc(alloc_id).unwrap_memory();
match result.ty().kind() { match result.ty().kind() {