Fixup conflict with r-l/r/126567

WaffleLapkin · WaffleLapkin · commit 39eaefc15db2 · 2024-07-07T20:16:48.000+02:00
diff --git a/compiler/rustc_const_eval/src/interpret/terminator.rs b/compiler/rustc_const_eval/src/interpret/terminator.rs
@@ -54,7 +54,7 @@ struct EvaluatedCalleeAndArgs<'tcx, M: Machine<'tcx>> {
     args: Vec<FnArg<'tcx, M::Provenance>>,
     fn_sig: ty::FnSig<'tcx>,
     fn_abi: &'tcx FnAbi<'tcx, Ty<'tcx>>,
-    /// True if the function is marked as `#[track_caller]` ([`ty::InstanceDef::requires_caller_location`])
+    /// True if the function is marked as `#[track_caller]` ([`ty::InstanceKind::requires_caller_location`])
     with_caller_location: bool,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ struct EvaluatedCalleeAndArgs<'tcx, M: Machine<'tcx>> {`
`54`	`54`	`args: Vec<FnArg<'tcx, M::Provenance>>,`
`55`	`55`	`fn_sig: ty::FnSig<'tcx>,`
`56`	`56`	`fn_abi: &'tcx FnAbi<'tcx, Ty<'tcx>>,`
`57`		- /// True if the function is marked as `#[track_caller]` ([`ty::InstanceDef::requires_caller_location`])
	`57`	+ /// True if the function is marked as `#[track_caller]` ([`ty::InstanceKind::requires_caller_location`])
`58`	`58`	`with_caller_location: bool,`
`59`	`59`	`}`
`60`	`60`