From: Niko Matsakis <niko@alum.mit.edu>
Date: Mon, 24 Jun 2019 19:55:39 +0000 (-0400)
Subject: more nits + typos
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=076b0d0f5cc33f108fda043c2e6e12229d734cf4;hp=9217909518cecc3b8636e970bfcb6c0be231e3f2;p=rust.git

more nits + typos
---

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 89d0be3a10c..4e609460c1f 100644
--- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
@@ -598,7 +598,7 @@ fn propagate_constraint_sccs_new(
             }
         }
 
-        // Now take member constraints into account. 
+        // Now take member constraints into account.
         let member_constraints = self.member_constraints.clone();
         for m_c_i in member_constraints.indices(scc_a) {
             self.apply_member_constraint(
@@ -1560,7 +1560,7 @@ fn check_member_constraints(
             let choice_regions = member_constraints.choice_regions(m_c_i);
             debug!("check_member_constraint: choice_regions={:?}", choice_regions);
 
-            // did the pick-region wind up equal to any of the option regions?
+            // Did the member region wind up equal to any of the option regions?
             if let Some(o) = choice_regions.iter().find(|&&o_r| {
                 self.eval_equal(o_r, m_c.member_region_vid)
             }) {
@@ -1568,7 +1568,7 @@ fn check_member_constraints(
                 continue;
             }
 
-            // if not, report an error
+            // If not, report an error.
             let region_scope_tree = &infcx.tcx.region_scope_tree(mir_def_id);
             let member_region = infcx.tcx.mk_region(ty::ReVar(member_region_vid));
             opaque_types::unexpected_hidden_region_diagnostic(
diff --git a/src/librustc_mir/borrow_check/nll/type_check/mod.rs b/src/librustc_mir/borrow_check/nll/type_check/mod.rs
index 2cdd1363cdf..cdbbe1d02bd 100644
--- a/src/librustc_mir/borrow_check/nll/type_check/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/type_check/mod.rs
@@ -2519,9 +2519,9 @@ fn prove_closure_bounds(
             let closure_constraints = QueryRegionConstraints {
                 outlives: closure_region_requirements.apply_requirements(tcx, def_id, substs),
 
-                // Presently, closures never propagate pick
+                // Presently, closures never propagate member
                 // constraints to their parents -- they are enforced
-                // locally.  This is largely a non-issue as pick
+                // locally.  This is largely a non-issue as member
                 // constraints only come from `-> impl Trait` and
                 // friends which don't appear (thus far...) in
                 // closures.
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 1223c069d65..e6a09e7f873 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -570,7 +570,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows explicit discriminants on non-unit enum variants.
     (active, arbitrary_enum_discriminant, "1.37.0", Some(60553), None),
 
-    // Allows impl trait with multiple unrelated lifetimes
+    // Allows `impl Trait` with multiple unrelated lifetimes.
     (active, member_constraints, "1.37.0", Some(61977), None),
 
     // -------------------------------------------------------------------------
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs
index a1ec89e8fbd..a103e21e047 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs
+++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs
@@ -10,7 +10,7 @@ trait Trait<'a, 'b> { }
 impl<T> Trait<'_, '_> for T { }
 
 // Here we wind up selecting `'a` and `'b` in the hidden type because
-// those are the types that appear inth e original values.
+// those are the types that appear in the original values.
 
 existential type Foo<'a, 'b>: Trait<'a, 'b>;
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
index 21979b00179..43f8bd71e41 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
+++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs
@@ -9,7 +9,7 @@ trait Trait<'a, 'b> { }
 impl<T> Trait<'_, '_> for T { }
 
 // Here we wind up selecting `'a` and `'b` in the hidden type because
-// those are the types that appear inth e original values.
+// those are the types that appear in the original values.
 
 fn upper_bounds<'a, 'b>(a: &'a u8, b: &'b u8) -> impl Trait<'a, 'b> {
     // In this simple case, you have a hidden type `(&'0 u8, &'1 u8)` and constraints like