bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use iter::from_fn in String::remove_matches

Browse source
This commit is contained in:
Tamir Duberstein 2021-03-26 10:38:32 -04:00
parent 3740ba2a7d
commit 38013e708e
No known key found for this signature in database
GPG key ID: 32E33EC15E1FEF3C
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
library/alloc/src/string.rs
View file

@ -48,7 +48,7 @@ use core::fmt;
use core::hash; use core::hash;
#[cfg(not(no_global_oom_handling))] #[cfg(not(no_global_oom_handling))]
use core::iter::FromIterator; use core::iter::FromIterator;
use core::iter::FusedIterator; use core::iter::{from_fn, FusedIterator};
#[cfg(not(no_global_oom_handling))] #[cfg(not(no_global_oom_handling))]
use core::ops::Add; use core::ops::Add;
#[cfg(not(no_global_oom_handling))] #[cfg(not(no_global_oom_handling))]
@ -1290,15 +1290,9 @@ impl String {
{ {
use core::str::pattern::Searcher; use core::str::pattern::Searcher;
let matches = { let matches: Vec<_> = {
let mut searcher = pat.into_searcher(self); let mut searcher = pat.into_searcher(self);
let mut matches = Vec::new(); from_fn(|| searcher.next_match()).collect()
while let Some(m) = searcher.next_match() {
matches.push(m);
}
matches
}; };
let len = self.len(); let len = self.len();