Auto merge of #143601 - matthiaskrgr:rollup-9iw2sqk, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#132469 (Do not suggest borrow that is already there in fully-qualified call) - rust-lang/rust#143340 (awhile -> a while where appropriate) - rust-lang/rust#143438 (Fix the link in `rustdoc.md`) - rust-lang/rust#143539 (Regression tests for repr ICEs) - rust-lang/rust#143566 (Fix `x86_64-unknown-netbsd` platform support page) - rust-lang/rust#143572 (Remove unused allow attrs) - rust-lang/rust#143583 (`loop_match`: fix 'no terminator on block') - rust-lang/rust#143584 (make `Machine::load_mir` infallible) - rust-lang/rust#143591 (Fix missing words in future tracking issue) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
@@ -272,7 +272,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
|
||||
let def = instance.def_id();
|
||||
&self.tcx.promoted_mir(def)[promoted]
|
||||
} else {
|
||||
M::load_mir(self, instance)?
|
||||
M::load_mir(self, instance)
|
||||
};
|
||||
// do not continue if typeck errors occurred (can only occur in local crate)
|
||||
if let Some(err) = body.tainted_by_errors {
|
||||
|
||||
@@ -189,8 +189,8 @@ pub trait Machine<'tcx>: Sized {
|
||||
fn load_mir(
|
||||
ecx: &InterpCx<'tcx, Self>,
|
||||
instance: ty::InstanceKind<'tcx>,
|
||||
) -> InterpResult<'tcx, &'tcx mir::Body<'tcx>> {
|
||||
interp_ok(ecx.tcx.instance_mir(instance))
|
||||
) -> &'tcx mir::Body<'tcx> {
|
||||
ecx.tcx.instance_mir(instance)
|
||||
}
|
||||
|
||||
/// Entry point to all function calls.
|
||||
|
||||
Reference in New Issue
Block a user