Auto merge of #35856 - phimuemue:master, r=brson

[rust.git] / src / librustc / ty / flags.rs

diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs
index c6c37296e9e1242f82ace140e67d388dd8992e9d..1afd49ab47fbfeb686252bb807173bac5fc2a248 100644 (file)
--- a/src/librustc/ty/flags.rs
+++ b/src/librustc/ty/flags.rs
@@ -137,7 +137,7 @@ fn add_sty(&mut self, st: &ty::TypeVariants) {
             }
 
             &ty::TyRef(r, ref m) => {
-                self.add_region(*r);
+                self.add_region(r);
                 self.add_ty(m.ty);
             }
 
@@ -176,8 +176,8 @@ fn add_fn_sig(&mut self, fn_sig: &ty::PolyFnSig) {
         self.add_bound_computation(&computation);
     }
 
-    fn add_region(&mut self, r: ty::Region) {
-        match r {
+    fn add_region(&mut self, r: &ty::Region) {
+        match *r {
             ty::ReVar(..) => {
                 self.add_flags(TypeFlags::HAS_RE_INFER);
                 self.add_flags(TypeFlags::KEEP_IN_LOCAL_TCX);
@@ -208,8 +208,11 @@ fn add_projection_ty(&mut self, projection_ty: &ty::ProjectionTy) {
     }
 
     fn add_substs(&mut self, substs: &Substs) {
-        self.add_tys(&substs.types);
-        for &r in &substs.regions {
+        for ty in substs.types() {
+            self.add_ty(ty);
+        }
+
+        for r in substs.regions() {
             self.add_region(r);
         }
     }