@@ -60,6 +60,7 @@ mod flows;
6060mod location;
6161mod path_utils;
6262crate mod place_ext;
63+ mod places_conflict;
6364mod prefixes;
6465mod used_muts;
6566
@@ -1307,7 +1308,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
13071308 // that is merged.
13081309 let sd = if might_be_alive { Deep } else { Shallow ( None ) } ;
13091310
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) {
13111312 debug ! ( "check_for_invalidation_at_exit({:?}): INVALID" , place) ;
13121313 // FIXME: should be talking about the region lifetime instead
13131314 // of just a span here.
@@ -1398,7 +1399,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
13981399 for i in flow_state. ever_inits . iter_incoming ( ) {
13991400 let init = self . move_data . inits [ i] ;
14001401 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 ) {
14021403 self . report_illegal_reassignment ( context, ( place, span) , init. span , err_place) ;
14031404 break ;
14041405 }
0 commit comments