Disable AST unused mut check when using MIR borrowck

KiChjang · KiChjang · commit 3e423d05863e · 2018-04-28T01:55:24.000-07:00
diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs
@@ -144,7 +144,10 @@ fn borrowck<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, owner_def_id: DefId)
     {
         check_loans::check_loans(&mut bccx, &loan_dfcx, &flowed_moves, &all_loans, body);
     }
-    unused::check(&mut bccx, body);
+
+    if !tcx.use_mir_borrowck() {
+        unused::check(&mut bccx, body);
+    }
 
     Lrc::new(BorrowCheckResult {
         used_mut_nodes: bccx.used_mut_nodes.into_inner(),

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,10 @@ fn borrowck<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, owner_def_id: DefId)`
`144`	`144`	`{`
`145`	`145`	`check_loans::check_loans(&mut bccx, &loan_dfcx, &flowed_moves, &all_loans, body);`
`146`	`146`	`}`
`147`		`- unused::check(&mut bccx, body);`
	`147`	`+`
	`148`	`+ if !tcx.use_mir_borrowck() {`
	`149`	`+ unused::check(&mut bccx, body);`
	`150`	`+ }`
`148`	`151`
`149`	`152`	`Lrc::new(BorrowCheckResult {`
`150`	`153`	`used_mut_nodes: bccx.used_mut_nodes.into_inner(),`