diff options
| author | Maybe Lapkin <waffle.lapkin@gmail.com> | 2024-07-07 20:16:48 +0200 |
|---|---|---|
| committer | Maybe Lapkin <waffle.lapkin@gmail.com> | 2024-07-07 20:16:48 +0200 |
| commit | 39eaefc15db286dc295134f0c65704e90eae1d0e (patch) | |
| tree | 120432cf2e0b6274b73754cf1b0b0b25818a1601 | |
| parent | 7fd0c55a1a85b42b02c378ba5472243cc17211dd (diff) | |
| download | rust-39eaefc15db286dc295134f0c65704e90eae1d0e.tar.gz rust-39eaefc15db286dc295134f0c65704e90eae1d0e.zip | |
Fixup conflict with r-l/r/126567
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/terminator.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/terminator.rs b/compiler/rustc_const_eval/src/interpret/terminator.rs index 76051f4651f..25f6bd64055 100644 --- 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, } |