pull out tcx

Author: lqd

Diff for: compiler/rustc_borrowck/src/nll.rs

@@ -225,16 +225,17 @@ pub(super) fn dump_nll_mir<'tcx>(
     closure_region_requirements: &Option<ClosureRegionRequirements<'tcx>>,
     borrow_set: &BorrowSet<'tcx>,
 ) {
-    if !dump_enabled(infcx.tcx, "nll", body.source.def_id()) {
+    let tcx = infcx.tcx;
+    if !dump_enabled(tcx, "nll", body.source.def_id()) {
         return;
     }
 
     // We want the NLL extra comments printed by default in NLL MIR dumps (they were removed in
     // #112346). Specifying `-Z mir-include-spans` on the CLI still has priority: for example,
     // they're always disabled in mir-opt tests to make working with blessed dumps easier.
-    let options = PrettyPrintMirOptions::from_cli_with_default(infcx.tcx, true);
+    let options = PrettyPrintMirOptions::from_cli_with_default(tcx, true);
     dump_mir_with_options(
-        infcx.tcx,
+        tcx,
         false,
         "nll",
         &0,
@@ -243,16 +244,14 @@ pub(super) fn dump_nll_mir<'tcx>(
             match pass_where {
                 // Before the CFG, dump out the values for each region variable.
                 PassWhere::BeforeCFG => {
-                    regioncx.dump_mir(infcx.tcx, out)?;
+                    regioncx.dump_mir(tcx, out)?;
                     writeln!(out, "|")?;
 
                     if let Some(closure_region_requirements) = closure_region_requirements {
                         writeln!(out, "| Free Region Constraints")?;
-                        for_each_region_constraint(
-                            infcx.tcx,
-                            closure_region_requirements,
-                            &mut |msg| writeln!(out, "| {msg}"),
-                        )?;
+                        for_each_region_constraint(tcx, closure_region_requirements, &mut |msg| {
+                            writeln!(out, "| {msg}")
+                        })?;
                         writeln!(out, "|")?;
                     }
 
@@ -282,13 +281,13 @@ pub(super) fn dump_nll_mir<'tcx>(
 
     // Also dump the inference graph constraints as a graphviz file.
     let _: io::Result<()> = try {
-        let mut file = create_dump_file(infcx.tcx, "regioncx.all.dot", false, "nll", &0, body)?;
+        let mut file = create_dump_file(tcx, "regioncx.all.dot", false, "nll", &0, body)?;
         regioncx.dump_graphviz_raw_constraints(&mut file)?;
     };
 
     // Also dump the inference graph constraints SCCs as a graphviz file.
     let _: io::Result<()> = try {
-        let mut file = create_dump_file(infcx.tcx, "regioncx.scc.dot", false, "nll", &0, body)?;
+        let mut file = create_dump_file(tcx, "regioncx.scc.dot", false, "nll", &0, body)?;
         regioncx.dump_graphviz_scc_constraints(&mut file)?;
     };
 }