rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-04-19 09:02:15 +02:00
Code Issues Releases Activity

short matches

Browse Source
This commit is contained in:
Andrew Gallant 2016-03-30 20:44:26 -04:00
parent 79a51029c1
commit f1a91307cd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/search.rs
View File

@ -101,12 +101,12 @@ impl<'b, 's> Iter<'b, 's> {
} }
if let Some(ref req) = self.searcher.required { if let Some(ref req) = self.searcher.required {
while self.start < self.buf.len() { while self.start < self.buf.len() {
let (s, e) = match req.find(&self.buf[self.start..]) { let e = match req.shortest_match(&self.buf[self.start..]) {
None => return None, None => return None,
Some((s, e)) => (self.start + s, self.start + e), Some(e) => self.start + e,
}; };
let (prevnl, nextnl) = self.find_line(s, e); let (prevnl, nextnl) = self.find_line(e, e);
match self.searcher.re.find(&self.buf[prevnl..nextnl]) { match self.searcher.re.shortest_match(&self.buf[prevnl..nextnl]) {
None => { None => {
self.start = nextnl + 1; self.start = nextnl + 1;
continue; continue;
@ -116,11 +116,11 @@ impl<'b, 's> Iter<'b, 's> {
} }
None None
} else { } else {
let (s, e) = match self.searcher.re.find(&self.buf[self.start..]) { let e = match self.searcher.re.shortest_match(&self.buf[self.start..]) {
None => return None, None => return None,
Some((s, e)) => (self.start + s, self.start + e), Some(e) => self.start + e,
}; };
Some(self.find_line(s, e)) Some(self.find_line(e, e))
} }
} }