fix docs

Author: Marwes

src/librustc/infer/outlives/verify.rs

@@ -144,11 +144,11 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
                 .map(|r| VerifyBound::OutlivedBy(r)),
         );
 
-        // see the extensive comment in projection_must_outlive
-        let ty = self.tcx.mk_projection(projection_ty.item_def_id, projection_ty.substs);
-        let recursive_bound = self.recursive_type_bound(ty);
-
-        VerifyBound::AnyBound(bounds).or(recursive_bound)
+        VerifyBound::AnyBound(bounds).or(|| {
+            // see the extensive comment in projection_must_outlive
+            let ty = self.tcx.mk_projection(projection_ty.item_def_id, projection_ty.substs);
+            self.recursive_type_bound(ty)
+        })
     }
 
     fn recursive_type_bound(&self, ty: Ty<'tcx>) -> VerifyBound<'tcx> {

src/librustc/infer/region_constraints/mod.rs

@@ -904,13 +904,18 @@ impl<'tcx> VerifyBound<'tcx> {
         }
     }
 
-    pub fn or(self, vb: VerifyBound<'tcx>) -> VerifyBound<'tcx> {
-        if self.must_hold() || vb.cannot_hold() {
+    pub fn or(self, vb: impl FnOnce() -> VerifyBound<'tcx>) -> VerifyBound<'tcx> {
+        if self.must_hold() {
             self
-        } else if self.cannot_hold() || vb.must_hold() {
-            vb
         } else {
-            VerifyBound::AnyBound(vec![self, vb])
+            let vb = vb();
+            if vb.cannot_hold() {
+                self
+            } else if self.cannot_hold() || vb.must_hold() {
+                vb
+            } else {
+                VerifyBound::AnyBound(vec![self, vb])
+            }
         }
     }
 

src/librustc/ty/sty.rs

@@ -2204,7 +2204,7 @@ impl<'tcx> TyS<'tcx> {
         }
     }
 
-    /// Pushes onto `out` the regions directly referenced from this type (but not
+    /// Returns the regions directly referenced from this type (but not
     /// types reachable from this type via `walk_tys`). This ignores late-bound
     /// regions binders.
     pub fn regions(&self) -> impl Iterator<Item = ty::Region<'tcx>> {