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_borrowck | |
| 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_borrowck')
| -rw-r--r-- | compiler/rustc_borrowck/src/def_use.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_borrowck/src/type_check/mod.rs | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_borrowck/src/def_use.rs b/compiler/rustc_borrowck/src/def_use.rs index 9e9f0b4b4ad..6deb4e361bc 100644 --- a/compiler/rustc_borrowck/src/def_use.rs +++ b/compiler/rustc_borrowck/src/def_use.rs @@ -50,7 +50,6 @@ pub fn categorize(context: PlaceContext) -> Option<DefUse> { PlaceContext::MutatingUse(MutatingUseContext::Borrow) | PlaceContext::NonMutatingUse(NonMutatingUseContext::SharedBorrow) | PlaceContext::NonMutatingUse(NonMutatingUseContext::ShallowBorrow) | - PlaceContext::NonMutatingUse(NonMutatingUseContext::UniqueBorrow) | PlaceContext::MutatingUse(MutatingUseContext::AddressOf) | PlaceContext::NonMutatingUse(NonMutatingUseContext::AddressOf) | diff --git a/compiler/rustc_borrowck/src/type_check/mod.rs b/compiler/rustc_borrowck/src/type_check/mod.rs index 375eca1b29d..2f10e30bec2 100644 --- a/compiler/rustc_borrowck/src/type_check/mod.rs +++ b/compiler/rustc_borrowck/src/type_check/mod.rs @@ -775,9 +775,10 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> { ty::Invariant } PlaceContext::NonMutatingUse( - Inspect | Copy | Move | SharedBorrow | ShallowBorrow | UniqueBorrow | AddressOf - | Projection, - ) => ty::Covariant, + Inspect | Copy | Move | SharedBorrow | ShallowBorrow | AddressOf | Projection + ) => { + ty::Covariant + }, PlaceContext::NonUse(AscribeUserTy) => ty::Covariant, } } |