X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_mir%2Fborrow_check%2Fplaces_conflict.rs;h=b5175cf41dd5c6293d7ba989d40636ab58646ea9;hb=9a3e22e32f634014b02f13495aef3f0e8cdbb1b7;hp=ac7182abb36daa58e617e421436fe3cb4064beb8;hpb=2cf7f55662bed29513eb9daecc3e72474ec023f5;p=rust.git diff --git a/src/librustc_mir/borrow_check/places_conflict.rs b/src/librustc_mir/borrow_check/places_conflict.rs index ac7182abb36..b5175cf41dd 100644 --- a/src/librustc_mir/borrow_check/places_conflict.rs +++ b/src/librustc_mir/borrow_check/places_conflict.rs @@ -1,6 +1,6 @@ -use borrow_check::ArtificialField; -use borrow_check::Overlap; -use borrow_check::{Deep, Shallow, AccessDepth}; +use crate::borrow_check::ArtificialField; +use crate::borrow_check::Overlap; +use crate::borrow_check::{Deep, Shallow, AccessDepth}; use rustc::hir; use rustc::mir::{BorrowKind, Mir, Place}; use rustc::mir::{Projection, ProjectionElem}; @@ -275,10 +275,10 @@ fn place_components_conflict<'gcx, 'tcx>( /// A linked list of places running up the stack; begins with the /// innermost place and extends to projections (e.g., `a.b` would have -/// the place `a` with a "next" pointer to `a.b`). Created by +/// the place `a` with a "next" pointer to `a.b`). Created by /// `unroll_place`. /// -/// N.B., this particular impl strategy is not the most obvious. It was +/// N.B., this particular impl strategy is not the most obvious. It was /// chosen because it makes a measurable difference to NLL /// performance, as this code (`borrow_conflicts_with_place`) is somewhat hot. struct PlaceComponents<'p, 'tcx: 'p> {