impl IntoIterator for SubstsRef

rust-lang · Apr 27, 2019 · 6a6887a · 6a6887a
1 parent ccabeca
commit 6a6887a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
@@ -56,7 +56,8 @@ impl<'a, 'gcx, T> ToStableHashKey<StableHashingContext<'a>> for &'gcx ty::List<T
 
 impl<'a, 'tcx> ToStableHashKey<StableHashingContext<'a>> for ty::subst::SubstsRef<'tcx>
 {
-    type KeyType = <&'tcx ty::List<ty::subst::Kind<'tcx>> as ToStableHashKey<StableHashingContext<'a>>>::KeyType;
+    type KeyType = <&'tcx ty::List<ty::subst::Kind<'tcx>>
+        as ToStableHashKey<StableHashingContext<'a>>>::KeyType;
 
     #[inline]
     fn to_stable_hash_key(&self, hcx: &StableHashingContext<'a>) -> Self::KeyType {

diff --git a/src/librustc/infer/opaque_types/mod.rs b/src/librustc/infer/opaque_types/mod.rs
@@ -408,7 +408,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                         substs,
                         item_def_id: _,
                     }) => {
-                        for k in substs.iter() {
+                        for k in substs {
                             match k.unpack() {
                                 UnpackedKind::Lifetime(lt) => bound_region(lt),
                                 UnpackedKind::Type(ty) => types.push(ty),

diff --git a/src/librustc/infer/outlives/obligations.rs b/src/librustc/infer/outlives/obligations.rs
@@ -431,7 +431,7 @@ where
         if approx_env_bounds.is_empty() && trait_bounds.is_empty() && needs_infer {
             debug!("projection_must_outlive: no declared bounds");
 
-            for k in projection_ty.substs.iter() {
+            for k in projection_ty.substs {
                 match k.unpack() {
                     UnpackedKind::Lifetime(lt) => {
                         self.delegate.push_sub_region_constraint(origin.clone(), region, lt);

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
@@ -716,7 +716,10 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                             let predicate = trait_predicate.map_bound(|mut trait_pred| {
                                 trait_pred.trait_ref.substs = self.tcx.mk_substs_trait(
                                     self.tcx.mk_unit(),
-                                    SubstsRef::from_slice(self.tcx, &trait_pred.trait_ref.substs[1..]),
+                                    SubstsRef::from_slice(
+                                        self.tcx,
+                                        &trait_pred.trait_ref.substs[1..],
+                                    ),
                                 );
                                 trait_pred
                             });

diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -572,7 +572,9 @@ impl<'tcx> TypeckTables<'tcx> {
 
     pub fn node_substs(&self, id: hir::HirId) -> SubstsRef<'tcx> {
         validate_hir_id_for_typeck_tables(self.local_id_root, id, false);
-        self.node_substs.get(&id.local_id).cloned().unwrap_or_else(|| InternalSubsts::empty().into())
+        self.node_substs.get(&id.local_id).cloned().unwrap_or_else(
+            || InternalSubsts::empty().into()
+        )
     }
 
     pub fn node_substs_opt(&self, id: hir::HirId) -> Option<SubstsRef<'tcx>> {
@@ -942,7 +944,7 @@ impl<'tcx> CommonTypes<'tcx> {
         };
 
         CommonTypes {
-            unit: mk(Tuple(List::empty())),
+            unit: mk(Tuple(SubstsRef::empty())),
             bool: mk(Bool),
             char: mk(Char),
             never: mk(Never),
@@ -2577,13 +2579,13 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
     #[inline]
     pub fn intern_tup(self, ts: &[Ty<'tcx>]) -> Ty<'tcx> {
         let kinds: Vec<_> = ts.into_iter().map(|&t| Kind::from(t)).collect();
-        self.mk_ty(Tuple(self.intern_substs(&kinds)))
+        self.mk_ty(Tuple(self.intern_substs(&kinds).into()))
     }
 
     pub fn mk_tup<I: InternAs<[Ty<'tcx>], Ty<'tcx>>>(self, iter: I) -> I::Output {
         iter.intern_with(|ts| {
             let kinds: Vec<_> = ts.into_iter().map(|&t| Kind::from(t)).collect();
-            self.mk_ty(Tuple(self.intern_substs(&kinds)))
+            self.mk_ty(Tuple(self.intern_substs(&kinds).into()))
         })
     }
 

diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs
@@ -195,7 +195,7 @@ impl FlagComputation {
                 self.add_ty(ty);
             }
 
-            &ty::Tuple(ref substs) => {
+            &ty::Tuple(substs) => {
                 self.add_substs(substs);
             }
 
@@ -268,7 +268,7 @@ impl FlagComputation {
     }
 
     fn add_substs(&mut self, substs: SubstsRef<'_>) {
-        for kind in substs.iter() {
+        for kind in substs {
             match kind.unpack() {
                 UnpackedKind::Type(ty) => self.add_ty(ty),
                 UnpackedKind::Lifetime(lt) => self.add_region(lt),

diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs
@@ -459,7 +459,10 @@ fn fn_once_adapter_instance<'a, 'tcx>(
     let sig = substs.closure_sig(closure_did, tcx);
     let sig = tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), &sig);
     assert_eq!(sig.inputs().len(), 1);
-    let substs = tcx.mk_substs_trait(self_ty, SubstsRef::from_slice(tcx, &[sig.inputs()[0].into()]));
+    let substs = tcx.mk_substs_trait(
+        self_ty,
+        SubstsRef::from_slice(tcx, &[sig.inputs()[0].into()]),
+    );
 
     debug!("fn_once_adapter_shim: self_ty={:?} sig={:?}", self_ty, sig);
     Instance { def, substs }

diff --git a/src/librustc/ty/subst.rs b/src/librustc/ty/subst.rs
@@ -210,6 +210,14 @@ impl<'tcx> From<&'tcx InternalSubsts<'tcx>> for SubstsRef<'tcx> {
     }
 }
 
+impl<'tcx> IntoIterator for SubstsRef<'tcx> {
+    type Item = &'tcx Kind<'tcx>;
+    type IntoIter = <&'tcx InternalSubsts<'tcx> as IntoIterator>::IntoIter;
+    fn into_iter(self) -> Self::IntoIter {
+        self.inner.into_iter()
+    }
+}
+
 BraceStructLiftImpl! {
     impl<'tcx> Lift<'tcx> for SubstsRef<'tcx> {
         type Lifted = SubstsRef<'tcx>;