d5f2d3b177
This commit updates the `MatchIndices` and `RMatchIndices` iterators to follow the same pattern as the `chars` and `char_indices` iterators. The `matches` iterator currently yield `&str` elements, so the `MatchIndices` iterator now yields the index of the match as well as the `&str` that matched (instead of start/end indexes). cc #27743
64 lines
1.7 KiB
Rust
64 lines
1.7 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// pretty-expanded FIXME #23616
|
|
|
|
trait Matcher {
|
|
fn next_match(&mut self) -> Option<(usize, usize)>;
|
|
}
|
|
|
|
struct CharPredMatcher<'a, 'b> {
|
|
str: &'a str,
|
|
pred: Box<FnMut(char) -> bool + 'b>,
|
|
}
|
|
|
|
impl<'a, 'b> Matcher for CharPredMatcher<'a, 'b> {
|
|
fn next_match(&mut self) -> Option<(usize, usize)> {
|
|
None
|
|
}
|
|
}
|
|
|
|
trait IntoMatcher<'a, T> {
|
|
fn into_matcher(self, &'a str) -> T;
|
|
}
|
|
|
|
impl<'a, 'b, F> IntoMatcher<'a, CharPredMatcher<'a, 'b>> for F where F: FnMut(char) -> bool + 'b {
|
|
fn into_matcher(self, s: &'a str) -> CharPredMatcher<'a, 'b> {
|
|
// FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
|
|
CharPredMatcher {
|
|
str: s,
|
|
pred: Box::new(self),
|
|
}
|
|
}
|
|
}
|
|
|
|
struct MatchIndices<M> {
|
|
matcher: M
|
|
}
|
|
|
|
impl<M: Matcher> Iterator for MatchIndices<M> {
|
|
type Item = (usize, usize);
|
|
|
|
fn next(&mut self) -> Option<(usize, usize)> {
|
|
self.matcher.next_match()
|
|
}
|
|
}
|
|
|
|
fn match_indices<'a, M, T: IntoMatcher<'a, M>>(s: &'a str, from: T) -> MatchIndices<M> {
|
|
let string_matcher = from.into_matcher(s);
|
|
MatchIndices { matcher: string_matcher }
|
|
}
|
|
|
|
fn main() {
|
|
let s = "abcbdef";
|
|
match_indices(s, |c: char| c == 'b')
|
|
.collect::<Vec<_>>();
|
|
}
|