Skip to content

Commit

Permalink
Auto merge of #3684 - rust-lang:rustup-2024-06-18, r=RalfJung
Browse files Browse the repository at this point in the history
Automatic Rustup
  • Loading branch information
bors committed Jun 18, 2024
2 parents 85e2549 + bb2c510 commit 606e143
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e794b0f8557c187b5909d889aa35071f81e0a4cc
c2932aaf9d20acbc9259c762f1a06f8767c6f13f
2 changes: 1 addition & 1 deletion src/intrinsics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
);
}
Ok(Some(ty::Instance {
def: ty::InstanceDef::Item(instance.def_id()),
def: ty::InstanceKind::Item(instance.def_id()),
args: instance.args,
}))
}
Expand Down

0 comments on commit 606e143

Please sign in to comment.