Move zip implementation from poly to poly/iter

Zip seems more appropriate on an iterator.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/poly.rs b/src/poly.rs
index 9c95796..0e1cd9e 100644
--- a/src/poly.rs
+++ b/src/poly.rs
@@ -2,10 +2,8 @@ mod iter;
 
 use crate::number::Number;
 use iter::Iter;
-use std::cmp;
 use std::cmp::Ordering;
 use std::ops::{Add, Sub, Mul, Rem};
-use std::iter::{Zip, Take};
 
 #[derive(PartialEq, Debug)]
 pub struct Poly(pub Vec<Number>);
@@ -20,14 +18,7 @@ impl Poly {
     }
 
     fn iter(&self) -> Iter {
-        Iter::new(self.0.clone())
-    }
-
-    fn zip(&self, other: &Self) -> Zip<Take<Iter>, Take<Iter>> {
-        let deg = cmp::max(self.degree(), other.degree()) + 1;
-        let a = self.iter().take(deg);
-        let b = other.iter().take(deg);
-        a.zip(b)
+        Iter::new(self.0.clone(), self.degree())
     }
 
     pub fn eval(&self, n: Number) -> Number {
@@ -52,7 +43,7 @@ impl Add for &Poly {
     type Output = Poly;
 
     fn add(self, other: Self) -> Poly {
-        Poly(self.zip(other).map(|(x, y)| {x + y}).collect())
+        Poly(self.iter().zip(other.iter()).map(|(x, y)| {x + y}).collect())
     }
 }
 
@@ -60,7 +51,7 @@ impl Sub for &Poly {
     type Output = Poly;
 
     fn sub(self, other: Self) -> Poly {
-        Poly(self.zip(other).map(|(x, y)| {x - y}).collect())
+        Poly(self.iter().zip(other.iter()).map(|(x, y)| {x - y}).collect())
     }
 }