mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid cloning Place in classify_drop_access_kind

Browse Source
This commit is contained in:
Santiago Pastorino 2019-07-19 19:36:47 +02:00
parent 75c0c8c6dc
commit 72251d5595
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc_mir/borrow_check/conflict_errors.rs
View File

@ -730,7 +730,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
}, 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 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
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 {