bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

regex: fix fallout

Browse source
This commit is contained in:
Jorge Aparicio 2015-01-01 22:38:05 -05:00
parent 17cf5e8104
commit f3333d5e10
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libregex/lib.rs
View file

@ -373,6 +373,7 @@
#![allow(unknown_features)] #![allow(unknown_features)]
#![feature(macro_rules, phase, slicing_syntax, globs)] #![feature(macro_rules, phase, slicing_syntax, globs)]
#![feature(unboxed_closures)] #![feature(unboxed_closures)]
#![feature(associated_types)]
#![deny(missing_docs)] #![deny(missing_docs)]
#[cfg(test)] #[cfg(test)]

28
src/libregex/re.rs
View file

@ -546,7 +546,9 @@ pub enum NamesIter<'a> {
NamesIterDynamic(::std::slice::Iter<'a, Option<String>>) NamesIterDynamic(::std::slice::Iter<'a, Option<String>>)
} }
impl<'a> Iterator<Option<String>> for NamesIter<'a> { impl<'a> Iterator for NamesIter<'a> {
type Item = Option<String>;
fn next(&mut self) -> Option<Option<String>> { fn next(&mut self) -> Option<Option<String>> {
match *self { match *self {
NamesIterNative(ref mut i) => i.next().map(|x| x.map(|s| s.to_string())), NamesIterNative(ref mut i) => i.next().map(|x| x.map(|s| s.to_string())),
@ -603,7 +605,9 @@ pub struct RegexSplits<'r, 't> {
last: uint, last: uint,
} }
impl<'r, 't> Iterator<&'t str> for RegexSplits<'r, 't> { impl<'r, 't> Iterator for RegexSplits<'r, 't> {
type Item = &'t str;
fn next(&mut self) -> Option<&'t str> { fn next(&mut self) -> Option<&'t str> {
let text = self.finder.search; let text = self.finder.search;
match self.finder.next() { match self.finder.next() {
@ -638,7 +642,9 @@ pub struct RegexSplitsN<'r, 't> {
limit: uint, limit: uint,
} }
impl<'r, 't> Iterator<&'t str> for RegexSplitsN<'r, 't> { impl<'r, 't> Iterator for RegexSplitsN<'r, 't> {
type Item = &'t str;
fn next(&mut self) -> Option<&'t str> { fn next(&mut self) -> Option<&'t str> {
let text = self.splits.finder.search; let text = self.splits.finder.search;
if self.cur >= self.limit { if self.cur >= self.limit {
@ -801,7 +807,9 @@ pub struct SubCaptures<'t> {
caps: &'t Captures<'t>, caps: &'t Captures<'t>,
} }
impl<'t> Iterator<&'t str> for SubCaptures<'t> { impl<'t> Iterator for SubCaptures<'t> {
type Item = &'t str;
fn next(&mut self) -> Option<&'t str> { fn next(&mut self) -> Option<&'t str> {
if self.idx < self.caps.len() { if self.idx < self.caps.len() {
self.idx += 1; self.idx += 1;
@ -824,7 +832,9 @@ pub struct SubCapturesPos<'t> {
caps: &'t Captures<'t>, caps: &'t Captures<'t>,
} }
impl<'t> Iterator<Option<(uint, uint)>> for SubCapturesPos<'t> { impl<'t> Iterator for SubCapturesPos<'t> {
type Item = Option<(uint, uint)>;
fn next(&mut self) -> Option<Option<(uint, uint)>> { fn next(&mut self) -> Option<Option<(uint, uint)>> {
if self.idx < self.caps.len() { if self.idx < self.caps.len() {
self.idx += 1; self.idx += 1;
@ -850,7 +860,9 @@ pub struct FindCaptures<'r, 't> {
last_end: uint, last_end: uint,
} }
impl<'r, 't> Iterator<Captures<'t>> for FindCaptures<'r, 't> { impl<'r, 't> Iterator for FindCaptures<'r, 't> {
type Item = Captures<'t>;
fn next(&mut self) -> Option<Captures<'t>> { fn next(&mut self) -> Option<Captures<'t>> {
if self.last_end > self.search.len() { if self.last_end > self.search.len() {
return None return None
@ -893,7 +905,9 @@ pub struct FindMatches<'r, 't> {
last_end: uint, last_end: uint,
} }
impl<'r, 't> Iterator<(uint, uint)> for FindMatches<'r, 't> { impl<'r, 't> Iterator for FindMatches<'r, 't> {
type Item = (uint, uint);
fn next(&mut self) -> Option<(uint, uint)> { fn next(&mut self) -> Option<(uint, uint)> {
if self.last_end > self.search.len() { if self.last_end > self.search.len() {
return None return None