about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-03-29 11:28:36 -0400
committerNiko Matsakis <niko@alum.mit.edu>2018-03-29 13:32:12 -0400
commitca8176d778cb1b89bf015b032872b6832be0cf8c (patch)
treea6ea4166210f785b91cfb1b42b93311927ca92a5
parentbd90302af6e0154a99de8b152d8831fd324910a8 (diff)
downloadrust-ca8176d778cb1b89bf015b032872b6832be0cf8c.tar.gz
rust-ca8176d778cb1b89bf015b032872b6832be0cf8c.zip
apply pnkfelix nits
-rw-r--r--src/librustc_mir/borrow_check/nll/region_infer/mod.rs26
1 files changed, 20 insertions, 6 deletions
diff --git a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
index a545a3716c9..08391401cc6 100644
--- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
@@ -149,7 +149,7 @@ pub struct Constraint {
     point: Location,
 
     /// Later on, we thread the constraints onto a linked list
-    /// sorted by their `sub` field. So if you had:
+    /// grouped by their `sub` field. So if you had:
     ///
     /// Index | Constraint | Next Field
     /// ----- | ---------- | ----------
@@ -423,9 +423,11 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         mir: &Mir<'tcx>,
         mir_def_id: DefId,
     ) -> Option<ClosureRegionRequirements<'gcx>> {
-        common::time(infcx.tcx.sess, &format!("solve({:?})", mir_def_id), || {
-            self.solve_inner(infcx, mir, mir_def_id)
-        })
+        common::time(
+            infcx.tcx.sess,
+            &format!("solve_nll_region_constraints({:?})", mir_def_id),
+            || self.solve_inner(infcx, mir, mir_def_id),
+        )
     }
 
     fn solve_inner<'gcx>(
@@ -451,7 +453,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             None
         };
 
-        self.check_type_tests(infcx, mir, dfs_storage, mir_def_id, outlives_requirements.as_mut());
+        self.check_type_tests(
+            infcx,
+            mir,
+            dfs_storage,
+            mir_def_id,
+            outlives_requirements.as_mut(),
+        );
 
         self.check_universal_regions(infcx, mir_def_id, outlives_requirements.as_mut());
 
@@ -587,7 +595,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         for type_test in &self.type_tests {
             debug!("check_type_test: {:?}", type_test);
 
-            if self.eval_region_test(mir, dfs_storage, type_test.point, type_test.lower_bound, &type_test.test) {
+            if self.eval_region_test(
+                mir,
+                dfs_storage,
+                type_test.point,
+                type_test.lower_bound,
+                &type_test.test,
+            ) {
                 continue;
             }