@@ -59,6 +59,7 @@ mod flows;
59
59
mod location;
60
60
mod path_utils;
61
61
crate mod place_ext;
62
+ mod places_conflict;
62
63
mod prefixes;
63
64
mod used_muts;
64
65
mod move_errors;
@@ -1309,7 +1310,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
1309
1310
// that is merged.
1310
1311
let sd = if might_be_alive { Deep } else { Shallow ( None ) } ;
1311
1312
1312
- if places_conflict ( self . tcx , self . mir , place, root_place, sd) {
1313
+ if places_conflict:: places_conflict ( self . tcx , self . mir , place, root_place, sd) {
1313
1314
debug ! ( "check_for_invalidation_at_exit({:?}): INVALID" , place) ;
1314
1315
// FIXME: should be talking about the region lifetime instead
1315
1316
// of just a span here.
@@ -1400,7 +1401,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
1400
1401
for i in flow_state. ever_inits . iter_incoming ( ) {
1401
1402
let init = self . move_data . inits [ i] ;
1402
1403
let init_place = & self . move_data . move_paths [ init. path ] . place ;
1403
- if places_conflict ( self . tcx , self . mir , & init_place, place, Deep ) {
1404
+ if places_conflict:: places_conflict ( self . tcx , self . mir , & init_place, place, Deep ) {
1404
1405
self . report_illegal_reassignment ( context, ( place, span) , init. span , err_place) ;
1405
1406
break ;
1406
1407
}
0 commit comments