Support arbitrary containers by IntoIterator blanket impl

Author: lukaslihotzki

src/runtime.rs

@@ -48,8 +48,6 @@ pub mod ext {
     use super::RepInterp;
     use super::{HasIterator as HasIter, ThereIsNoIteratorInRepetition as DoesNotHaveIter};
     use crate::ToTokens;
-    use core::slice;
-    use std::collections::btree_set::{self, BTreeSet};
 
     /// Extension trait providing the `quote_into_iter` method on iterators.
     pub trait RepIteratorExt: Iterator + Sized {
@@ -60,6 +58,16 @@ pub mod ext {
 
     impl<T: Iterator> RepIteratorExt for T {}
 
+    /// Extension trait providing the `quote_into_iter` method on containers
+    /// implementing IntoIterator.
+    pub trait RepIntoIteratorExt: IntoIterator + Copy + Sized {
+        fn quote_into_iter(self) -> (Self::IntoIter, HasIter) {
+            (self.into_iter(), HasIter)
+        }
+    }
+
+    impl<T: IntoIterator + Copy> RepIntoIteratorExt for T {}
+
     /// Extension trait providing the `quote_into_iter` method for
     /// non-iterable types. These types interpolate the same value in each
     /// iteration of the repetition.
@@ -102,30 +110,6 @@ pub mod ext {
         }
     }
 
-    impl<'q, T: 'q> RepAsIteratorExt<'q> for [T] {
-        type Iter = slice::Iter<'q, T>;
-
-        fn quote_into_iter(&'q self) -> (Self::Iter, HasIter) {
-            (self.iter(), HasIter)
-        }
-    }
-
-    impl<'q, T: 'q> RepAsIteratorExt<'q> for Vec<T> {
-        type Iter = slice::Iter<'q, T>;
-
-        fn quote_into_iter(&'q self) -> (Self::Iter, HasIter) {
-            (self.iter(), HasIter)
-        }
-    }
-
-    impl<'q, T: 'q> RepAsIteratorExt<'q> for BTreeSet<T> {
-        type Iter = btree_set::Iter<'q, T>;
-
-        fn quote_into_iter(&'q self) -> (Self::Iter, HasIter) {
-            (self.iter(), HasIter)
-        }
-    }
-
     impl<'q, T: RepAsIteratorExt<'q>> RepAsIteratorExt<'q> for RepInterp<T> {
         type Iter = T::Iter;