Skip to content

Commit fd0d65d

Browse files
Remove _iter suffix on match_iter methods
In light of rust-lang/rust#10622.
1 parent b8ef357 commit fd0d65d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/pcre/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ impl Pcre {
299299
/// # Argument
300300
/// * `subject` - The subject string.
301301
#[inline]
302-
pub fn match_iter<'a>(&self, subject: &'a str) -> MatchIterator<'a> {
303-
self.match_iter_with_options(subject, 0)
302+
pub fn matches<'a>(&self, subject: &'a str) -> MatchIterator<'a> {
303+
self.matches_with_options(subject, 0)
304304
}
305305

306306
/// Creates a `MatchIterator` for iterating through matches within the given subject
@@ -311,7 +311,7 @@ impl Pcre {
311311
/// * `options` - Bitwise-OR'd matching options. See the libpcre manpages, `man 3 pcre_exec`,
312312
/// for more information.
313313
#[inline]
314-
pub fn match_iter_with_options<'a>(&self, subject: &'a str, options: options) -> MatchIterator<'a> {
314+
pub fn matches_with_options<'a>(&self, subject: &'a str, options: options) -> MatchIterator<'a> {
315315
unsafe {
316316
let ovecsize = (self.capture_count_ + 1) * 3;
317317
MatchIterator {

src/pcre/test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ fn test_study_basic() {
7575
}
7676

7777
#[test]
78-
fn test_match_iter_basic() {
78+
fn test_matches_basic() {
7979
let subject = "\0abc1111abcabc___ababc+a";
8080
let mut it = {
8181
let re = Pcre::compile("abc").unwrap();
82-
re.match_iter(subject)
82+
re.matches(subject)
8383

8484
// The MatchIterator should retain a reference to the `pcre`.
8585
};

0 commit comments

Comments
 (0)