@@ -846,7 +846,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
846
846
MutabilityViolation => {
847
847
let mut db = self . cannot_assign ( error_span, & descr, Origin :: Ast ) ;
848
848
if let mc:: NoteClosureEnv ( upvar_id) = err. cmt . note {
849
- let node_id = self . tcx . hir . hir_to_node_id ( upvar_id. var_id ) ;
849
+ let node_id = self . tcx . hir . hir_to_node_id ( upvar_id. var_path . hir_id ) ;
850
850
let sp = self . tcx . hir . span ( node_id) ;
851
851
let fn_closure_msg = "`Fn` closures cannot capture their enclosing \
852
852
environment for modifications";
@@ -1415,7 +1415,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
1415
1415
loan_path : & LoanPath < ' tcx > ,
1416
1416
out : & mut String ) {
1417
1417
match loan_path. kind {
1418
- LpUpvar ( ty:: UpvarId { var_id : id , closure_expr_id : _ } ) => {
1418
+ LpUpvar ( ty:: UpvarId { var_path : ty :: UpvarPath { hir_id : id } , closure_expr_id : _ } ) => {
1419
1419
out. push_str ( & self . tcx . hir . name ( self . tcx . hir . hir_to_node_id ( id) ) . as_str ( ) ) ;
1420
1420
}
1421
1421
LpVar ( id) => {
@@ -1533,7 +1533,7 @@ impl<'tcx> fmt::Debug for LoanPath<'tcx> {
1533
1533
write ! ( f, "$({})" , ty:: tls:: with( |tcx| tcx. hir. node_to_string( id) ) )
1534
1534
}
1535
1535
1536
- LpUpvar ( ty:: UpvarId { var_id, closure_expr_id } ) => {
1536
+ LpUpvar ( ty:: UpvarId { var_path : ty :: UpvarPath { hir_id : var_id} , closure_expr_id } ) => {
1537
1537
let s = ty:: tls:: with ( |tcx| {
1538
1538
let var_node_id = tcx. hir . hir_to_node_id ( var_id) ;
1539
1539
tcx. hir . node_to_string ( var_node_id)
@@ -1568,9 +1568,9 @@ impl<'tcx> fmt::Display for LoanPath<'tcx> {
1568
1568
write ! ( f, "$({})" , ty:: tls:: with( |tcx| tcx. hir. node_to_user_string( id) ) )
1569
1569
}
1570
1570
1571
- LpUpvar ( ty:: UpvarId { var_id , closure_expr_id : _ } ) => {
1571
+ LpUpvar ( ty:: UpvarId { var_path : ty :: UpvarPath { hir_id } , closure_expr_id : _ } ) => {
1572
1572
let s = ty:: tls:: with ( |tcx| {
1573
- let var_node_id = tcx. hir . hir_to_node_id ( var_id ) ;
1573
+ let var_node_id = tcx. hir . hir_to_node_id ( hir_id ) ;
1574
1574
tcx. hir . node_to_string ( var_node_id)
1575
1575
} ) ;
1576
1576
write ! ( f, "$({} captured by closure)" , s)
0 commit comments