language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Auto merge of #15022 - HKalbasi:nightly-mir-eval-panic, r=HKalbasi

Browse source 
Fix panic in displaying unsized structs
This commit is contained in:
bors 2023-06-10 08:06:56 +00:00
commit 49b4f15973
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/hir-ty/src/display.rs
View file

@ -2,7 +2,10 @@
//! HIR back into source code, and just displaying them for debugging/testing
//! purposes.
use std::fmt::{self, Debug};
use std::{
fmt::{self, Debug},
mem::size_of,
};
use base_db::CrateId;
use chalk_ir::{BoundVar, TyKind};
@ -552,6 +555,16 @@ fn render_const_scalar(
f.write_str("&")?;
render_const_scalar(f, bytes, memory_map, t)
}
TyKind::Adt(adt, _) if b.len() == 2 * size_of::<usize>() => match adt.0 {
hir_def::AdtId::StructId(s) => {
let data = f.db.struct_data(s);
write!(f, "&{}", data.name.display(f.db.upcast()))?;
Ok(())
}
_ => {
return f.write_str("<unsized-enum-or-union>");
}
},
_ => {
let addr = usize::from_le_bytes(match b.try_into() {
Ok(b) => b,