@@ -846,7 +846,7 @@ use self::ReadOrWrite::{Activation, Read, Reservation, Write};
846846#[ derive( Copy ,  Clone ,  PartialEq ,  Eq ,  Debug ) ]  
847847enum  ArtificialField  { 
848848    ArrayLength , 
849-     ShallowBorrow , 
849+     FakeBorrow , 
850850} 
851851
852852#[ derive( Copy ,  Clone ,  PartialEq ,  Eq ,  Debug ) ]  
@@ -1085,18 +1085,18 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10851085                    Control :: Continue 
10861086                } 
10871087
1088-                 ( Read ( _) ,  BorrowKind :: Shared  | BorrowKind :: Shallow ) 
1089-                 | ( Read ( ReadKind :: Borrow ( BorrowKind :: Shallow ) ) ,  BorrowKind :: Mut  {  .. } )  => { 
1088+                 ( Read ( _) ,  BorrowKind :: Shared  | BorrowKind :: Fake ) 
1089+                 | ( Read ( ReadKind :: Borrow ( BorrowKind :: Fake ) ) ,  BorrowKind :: Mut  {  .. } )  => { 
10901090                    Control :: Continue 
10911091                } 
10921092
1093-                 ( Reservation ( _) ,  BorrowKind :: Shallow  | BorrowKind :: Shared )  => { 
1093+                 ( Reservation ( _) ,  BorrowKind :: Fake  | BorrowKind :: Shared )  => { 
10941094                    // This used to be a future compatibility warning (to be 
10951095                    // disallowed on NLL). See rust-lang/rust#56254 
10961096                    Control :: Continue 
10971097                } 
10981098
1099-                 ( Write ( WriteKind :: Move ) ,  BorrowKind :: Shallow )  => { 
1099+                 ( Write ( WriteKind :: Move ) ,  BorrowKind :: Fake )  => { 
11001100                    // Handled by initialization checks. 
11011101                    Control :: Continue 
11021102                } 
@@ -1204,8 +1204,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
12041204        match  rvalue { 
12051205            & Rvalue :: Ref ( _ /*rgn*/ ,  bk,  place)  => { 
12061206                let  access_kind = match  bk { 
1207-                     BorrowKind :: Shallow  => { 
1208-                         ( Shallow ( Some ( ArtificialField :: ShallowBorrow ) ) ,  Read ( ReadKind :: Borrow ( bk) ) ) 
1207+                     BorrowKind :: Fake  => { 
1208+                         ( Shallow ( Some ( ArtificialField :: FakeBorrow ) ) ,  Read ( ReadKind :: Borrow ( bk) ) ) 
12091209                    } 
12101210                    BorrowKind :: Shared  => ( Deep ,  Read ( ReadKind :: Borrow ( bk) ) ) , 
12111211                    BorrowKind :: Mut  {  .. }  => { 
@@ -1226,7 +1226,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
12261226                    flow_state, 
12271227                ) ; 
12281228
1229-                 let  action = if  bk == BorrowKind :: Shallow  { 
1229+                 let  action = if  bk == BorrowKind :: Fake  { 
12301230                    InitializationRequiringAction :: MatchOn 
12311231                }  else  { 
12321232                    InitializationRequiringAction :: Borrow 
@@ -1583,7 +1583,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15831583
15841584            // only mutable borrows should be 2-phase 
15851585            assert ! ( match  borrow. kind { 
1586-                 BorrowKind :: Shared  | BorrowKind :: Shallow  => false , 
1586+                 BorrowKind :: Shared  | BorrowKind :: Fake  => false , 
15871587                BorrowKind :: Mut  {  .. }  => true , 
15881588            } ) ; 
15891589
@@ -2142,14 +2142,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
21422142                | WriteKind :: Replace 
21432143                | WriteKind :: StorageDeadOrDrop 
21442144                | WriteKind :: MutableBorrow ( BorrowKind :: Shared ) 
2145-                 | WriteKind :: MutableBorrow ( BorrowKind :: Shallow ) , 
2145+                 | WriteKind :: MutableBorrow ( BorrowKind :: Fake ) , 
21462146            ) 
21472147            | Write ( 
21482148                WriteKind :: Move 
21492149                | WriteKind :: Replace 
21502150                | WriteKind :: StorageDeadOrDrop 
21512151                | WriteKind :: MutableBorrow ( BorrowKind :: Shared ) 
2152-                 | WriteKind :: MutableBorrow ( BorrowKind :: Shallow ) , 
2152+                 | WriteKind :: MutableBorrow ( BorrowKind :: Fake ) , 
21532153            )  => { 
21542154                if  self . is_mutable ( place. as_ref ( ) ,  is_local_mutation_allowed) . is_err ( ) 
21552155                    && !self . has_buffered_errors ( ) 
@@ -2173,7 +2173,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
21732173                return  false ; 
21742174            } 
21752175            Read ( 
2176-                 ReadKind :: Borrow ( BorrowKind :: Mut  {  .. }  | BorrowKind :: Shared  | BorrowKind :: Shallow ) 
2176+                 ReadKind :: Borrow ( BorrowKind :: Mut  {  .. }  | BorrowKind :: Shared  | BorrowKind :: Fake ) 
21772177                | ReadKind :: Copy , 
21782178            )  => { 
21792179                // Access authorized 
0 commit comments