mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #2009 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup
This commit is contained in:
bors 2022-03-08 01:08:11 +00:00
commit 722475ccc1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
d137c3a7bd3b180317044f8ccb9a8b4b3bb07db3
89adcc636f94d34a6fc90fa117e28ddf6be7b983

2
src/shims/backtrace.rs
View File

@ -105,7 +105,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
// which we pass to user code.
let fn_ptr = this.memory.create_fn_alloc(FnVal::Instance(fn_instance));
let num_fields = dest.layout.layout.fields.count();
let num_fields = dest.layout.fields.count();
if !(4..=5).contains(&num_fields) {
// Always mention 5 fields, since the 4-field struct