bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Apply suggestions from code review

Browse source
This commit is contained in:
Niko Matsakis 2021-07-06 20:52:53 -04:00 • committed by GitHub
parent 32fa96486a
commit 38dcae2cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_typeck/src/check/upvar.rs
View file

@ -2003,9 +2003,13 @@ fn determine_place_ancestry_relation(
fn truncate_capture_for_optimization<'tcx>(place: &Place<'tcx>) -> Place<'tcx> { fn truncate_capture_for_optimization<'tcx>(place: &Place<'tcx>) -> Place<'tcx> {
let is_shared_ref = |ty: Ty<'_>| matches!(ty.kind(), ty::Ref(.., hir::Mutability::Not)); let is_shared_ref = |ty: Ty<'_>| matches!(ty.kind(), ty::Ref(.., hir::Mutability::Not));
// Find the right-most deref (if any). All the projections that come after this
// are fields or other "in-place pointer adjustments"; these refer therefore to
// data owned by whatever pointer is being dereferenced here.
let idx = place.projections.iter().rposition(|proj| ProjectionKind::Deref == proj.kind); let idx = place.projections.iter().rposition(|proj| ProjectionKind::Deref == proj.kind);
match idx { match idx {
// If that pointer is a shared reference, then we don't need those fields.
Some(idx) if is_shared_ref(place.ty_before_projection(idx)) => { Some(idx) if is_shared_ref(place.ty_before_projection(idx)) => {
Place { projections: place.projections[0..=idx].to_vec(), ..place.clone() } Place { projections: place.projections[0..=idx].to_vec(), ..place.clone() }
} }