Fix tuple_windows as lazy

Author: aobatact

src/tuple_impl.rs

@@ -139,31 +139,19 @@ pub struct TupleWindows<I, T>
     where I: Iterator<Item = T::Item>,
           T: HomogeneousTuple
 {
-    iter: I,
+    iter: Fuse<I>,
     last: Option<T>,
 }
 
 /// Create a new tuple windows iterator.
-pub fn tuple_windows<I, T>(mut iter: I) -> TupleWindows<I, T>
+pub fn tuple_windows<I, T>(iter: I) -> TupleWindows<I, T>
     where I: Iterator<Item = T::Item>,
           T: HomogeneousTuple,
           T::Item: Clone
 {
-    use std::iter::once;
-
-    let mut last = None;
-    if T::num_items() != 1 {
-        // put in a duplicate item in front of the tuple; this simplifies
-        // .next() function.
-        if let Some(item) = iter.next() {
-            let iter = once(item.clone()).chain(once(item)).chain(&mut iter);
-            last = T::collect_from_iter_no_buf(iter);
-        }
-    }
-
     TupleWindows {
-        last,
-        iter,
+        last : None,
+        iter : iter.fuse(),
     }
 }
 
@@ -183,13 +171,20 @@ impl<I, T> Iterator for TupleWindows<I, T>
                 last.left_shift_push(new);
                 return Some(last.clone());
             }
+        } else {
+            use std::iter::once;
+            if let Some(item) = self.iter.next() {
+                let iter = once(item).chain(&mut self.iter);
+                self.last = T::collect_from_iter_no_buf(iter);
+                return self.last.clone();
+            }
         }
         None
     }
 }
 
 impl<I, T> FusedIterator for TupleWindows<I, T>
-    where I: FusedIterator<Item = T::Item>,
+    where I: Iterator<Item = T::Item>,
           T: HomogeneousTuple + Clone,
           T::Item: Clone
 {}