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

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

Browse Source 
rustup
This commit is contained in:
bors 2021-12-19 18:49:41 +00:00
commit cac6759451
2 changed files with 3 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 @@
c5ecc157043ba413568b09292001a4a74b541a4e
41c3017c82bbc16842cc3bc1afa904e6910e293c

3
src/shims/intrinsics.rs
View File

@ -32,7 +32,8 @@ fn call_intrinsic(
}
// All supported intrinsics have a return place.
let intrinsic_name = &*this.tcx.item_name(instance.def_id()).as_str();
let intrinsic_name = this.tcx.item_name(instance.def_id());
let intrinsic_name = intrinsic_name.as_str();
let (dest, ret) = match ret {
None => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),
Some(p) => p,