diff options
| author | bors <bors@rust-lang.org> | 2023-05-31 19:26:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-31 19:26:05 +0000 |
| commit | 90c541806f23a127002de5b4038be731ba1458ca (patch) | |
| tree | d3e039dc1ad5b4c1e151ee6af36cd76b61e46330 /compiler/rustc_mir_transform/src | |
| parent | d332def19cf07973b736d0c7eb1b690d7c9d945e (diff) | |
| parent | 4930c02c008211f06482fef848dbf5d459475efb (diff) | |
| download | rust-1.70.0.tar.gz rust-1.70.0.zip | |
Auto merge of #112145 - wesleywiser:backport_112070, r=Mark-Simulacrum 1.70.0
Backport of #112070 Backports #112070 to stable r? `@Mark-Simulacrum`
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/copy_prop.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop.rs b/compiler/rustc_mir_transform/src/const_prop.rs index c0146e3efb0..1bb45341e8c 100644 --- a/compiler/rustc_mir_transform/src/const_prop.rs +++ b/compiler/rustc_mir_transform/src/const_prop.rs @@ -822,7 +822,6 @@ impl Visitor<'_> for CanConstProp { // mutation. | NonMutatingUse(NonMutatingUseContext::SharedBorrow) | NonMutatingUse(NonMutatingUseContext::ShallowBorrow) - | NonMutatingUse(NonMutatingUseContext::UniqueBorrow) | NonMutatingUse(NonMutatingUseContext::AddressOf) | MutatingUse(MutatingUseContext::Borrow) | MutatingUse(MutatingUseContext::AddressOf) => { diff --git a/compiler/rustc_mir_transform/src/copy_prop.rs b/compiler/rustc_mir_transform/src/copy_prop.rs index c155048c98b..b571215f212 100644 --- a/compiler/rustc_mir_transform/src/copy_prop.rs +++ b/compiler/rustc_mir_transform/src/copy_prop.rs @@ -131,7 +131,6 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> { PlaceContext::NonMutatingUse( NonMutatingUseContext::SharedBorrow | NonMutatingUseContext::ShallowBorrow - | NonMutatingUseContext::UniqueBorrow | NonMutatingUseContext::AddressOf, ) => true, // For debuginfo, merging locals is ok. |