Remove last_match fields

Author: defuz

src/re.rs

@@ -350,7 +350,6 @@ impl Regex {
             re: self,
             search: text,
             last_end: 0,
-            last_match: None,
         }
     }
 
@@ -454,7 +453,6 @@ impl Regex {
         FindCaptures {
             re: self,
             search: text,
-            last_match: None,
             last_end: 0,
         }
     }
@@ -1059,7 +1057,6 @@ impl<'t> Iterator for SubCapturesNamed<'t> {
 pub struct FindCaptures<'r, 't> {
     re: &'r Regex,
     search: &'t str,
-    last_match: Option<usize>,
     last_end: usize,
 }
 
@@ -1079,16 +1076,12 @@ impl<'r, 't> Iterator for FindCaptures<'r, 't> {
 
         // Don't accept empty matches immediately following a match.
         // i.e., no infinite loops please.
-        if e == s && Some(self.last_end) == self.last_match {
-            if self.last_end >= self.search.len() {
-                return None;
-            }
+        if e == s {
             self.last_end += self.search[self.last_end..].chars()
-                                 .next().unwrap().len_utf8();
-            return self.next()
+                                 .next().map(|c| c.len_utf8()).unwrap_or(0);
+        } else {
+            self.last_end = e;
         }
-        self.last_end = e;
-        self.last_match = Some(self.last_end);
         Some(Captures::new(self.re, self.search, caps))
     }
 }
@@ -1104,7 +1097,6 @@ impl<'r, 't> Iterator for FindCaptures<'r, 't> {
 pub struct FindMatches<'r, 't> {
     re: &'r Regex,
     search: &'t str,
-    last_match: Option<usize>,
     last_end: usize,
 }
 
@@ -1124,16 +1116,12 @@ impl<'r, 't> Iterator for FindMatches<'r, 't> {
 
         // Don't accept empty matches immediately following a match.
         // i.e., no infinite loops please.
-        if e == s && Some(self.last_end) == self.last_match {
-            if self.last_end >= self.search.len() {
-                return None;
-            }
+        if e == s {
             self.last_end += self.search[self.last_end..].chars()
-                                 .next().unwrap().len_utf8();
-            return self.next()
+                                 .next().map(|c| c.len_utf8()).unwrap_or(1);
+        } else {
+            self.last_end = e;
         }
-        self.last_end = e;
-        self.last_match = Some(self.last_end);
         Some((s, e))
     }
 }