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