diff options
| author | bors <bors@rust-lang.org> | 2022-04-06 03:45:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-06 03:45:36 +0000 |
| commit | 5da76eeaad7b57eaee81fc28067952f96abf8377 (patch) | |
| tree | c2cc39f826782ce19f6001d93e0f430810aea709 /compiler/rustc_mir_transform/src | |
| parent | 26b5e0cbb95ce5b1cbf91d49fb45d122479e3363 (diff) | |
| parent | b4527492b1630c18deb7206ec703d71a372da664 (diff) | |
| download | rust-5da76eeaad7b57eaee81fc28067952f96abf8377.tar.gz rust-5da76eeaad7b57eaee81fc28067952f96abf8377.zip | |
Auto merge of #95711 - Dylan-DPC:rollup-ujss3oi, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #95659 (Rely on #[link] attribute for unwind on Fuchsia.) - #95684 (rustdoc: Fix item info display overflow) - #95693 (interp: pass TyCtxt to Machine methods that do not take InterpCx) - #95699 (fix: Vec leak when capacity is 0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop_lint.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop.rs b/compiler/rustc_mir_transform/src/const_prop.rs index 49ebdd30254..a342aeed905 100644 --- a/compiler/rustc_mir_transform/src/const_prop.rs +++ b/compiler/rustc_mir_transform/src/const_prop.rs @@ -265,6 +265,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx> } fn before_access_global( + _tcx: TyCtxt<'tcx>, _machine: &Self, _alloc_id: AllocId, alloc: ConstAllocation<'tcx, Self::PointerTag, Self::AllocExtra>, diff --git a/compiler/rustc_mir_transform/src/const_prop_lint.rs b/compiler/rustc_mir_transform/src/const_prop_lint.rs index 602aa14b9e6..159503ad2d3 100644 --- a/compiler/rustc_mir_transform/src/const_prop_lint.rs +++ b/compiler/rustc_mir_transform/src/const_prop_lint.rs @@ -261,6 +261,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx> } fn before_access_global( + _tcx: TyCtxt<'tcx>, _machine: &Self, _alloc_id: AllocId, alloc: ConstAllocation<'tcx, Self::PointerTag, Self::AllocExtra>, |