@@ -997,12 +997,13 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
997997 }
998998 }
999999
1000- fn maybe_polonius_borrows_in_scope < ' s > (
1000+ fn borrows_in_scope < ' s > (
10011001 & self ,
10021002 location : Location ,
10031003 state : & ' s BorrowckDomain ,
10041004 ) -> Cow < ' s , BitSet < BorrowIndex > > {
10051005 if let Some ( polonius) = & self . polonius_output {
1006+ // Use polonius output if it has been enabled.
10061007 let location = self . location_table . start_index ( location) ;
10071008 let mut polonius_output = BitSet :: new_empty ( self . borrow_set . len ( ) ) ;
10081009 for & idx in polonius. errors_at ( location) {
@@ -1025,8 +1026,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
10251026 ) -> bool {
10261027 let mut error_reported = false ;
10271028
1028- // Use polonius output if it has been enabled.
1029- let borrows_in_scope = self . maybe_polonius_borrows_in_scope ( location, state) ;
1029+ let borrows_in_scope = self . borrows_in_scope ( location, state) ;
10301030
10311031 each_borrow_involving_path (
10321032 self ,
@@ -1158,7 +1158,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
11581158 let sd = AccessDepth :: Drop ;
11591159
11601160 // Use polonius output if it has been enabled.
1161- let borrows_in_scope = self . maybe_polonius_borrows_in_scope ( location, state) ;
1161+ let borrows_in_scope = self . borrows_in_scope ( location, state) ;
11621162
11631163 // This is a very simplified version of `Self::check_access_for_conflict`.
11641164 // We are here checking on BIDs and specifically still-live borrows of data involving the BIDs.
0 commit comments