From 72251d5595ca4f5e7a57ab6f0db0d0a498d5b737 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 19 Jul 2019 19:36:47 +0200 Subject: [PATCH] Avoid cloning Place in classify_drop_access_kind --- src/librustc_mir/borrow_check/conflict_errors.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustc_mir/borrow_check/conflict_errors.rs b/src/librustc_mir/borrow_check/conflict_errors.rs index 83ae87bc166..95fc22dc5eb 100644 --- a/src/librustc_mir/borrow_check/conflict_errors.rs +++ b/src/librustc_mir/borrow_check/conflict_errors.rs @@ -730,7 +730,7 @@ pub(super) fn report_borrowed_value_does_not_live_long_enough( }, borrow_span)); if let StorageDeadOrDrop::Destructor(dropped_ty) = - self.classify_drop_access_kind(&borrow.borrowed_place) + self.classify_drop_access_kind(borrow.borrowed_place.as_place_ref()) { // If a borrow of path `B` conflicts with drop of `D` (and // we're not in the uninteresting case where `B` is a @@ -1505,16 +1505,16 @@ pub(super) fn report_illegal_reassignment( err.buffer(&mut self.errors_buffer); } - fn classify_drop_access_kind(&self, place: &Place<'tcx>) -> StorageDeadOrDrop<'tcx> { + fn classify_drop_access_kind(&self, place: PlaceRef<'cx, 'tcx>) -> StorageDeadOrDrop<'tcx> { let tcx = self.infcx.tcx; match place.projection { None => { StorageDeadOrDrop::LocalStorageDead } Some(box Projection { ref base, ref elem }) => { - let base_access = self.classify_drop_access_kind(&Place { - base: place.base.clone(), - projection: base.clone(), + let base_access = self.classify_drop_access_kind(PlaceRef { + base: place.base, + projection: base, }); match elem { ProjectionElem::Deref => match base_access { -- 2.44.0