T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Idiomatic impl of unordered_begin.

Browse Source
This commit is contained in:
Jakob Stoklund Olesen
2016-09-10 12:33:58 -07:00
parent 38952eea00
commit 1c5547970a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cranelift/src/libfilecheck/checker.rs
View File

@@ -302,13 +302,11 @@ impl<'a> State<'a> {
// Get the beginning of the range in text to be matched by a `unordered:` or `not:` directive. // Get the beginning of the range in text to be matched by a `unordered:` or `not:` directive.
// The unordered directive must match after the directives that define the variables used. // The unordered directive must match after the directives that define the variables used.
fn unordered_begin(&self, pat: &Pattern) -> usize { fn unordered_begin(&self, pat: &Pattern) -> usize {
let mut from = self.last_ordered; pat.parts()
for part in pat.parts() { .iter()
if let Some(var) = part.ref_var() { .filter_map(|part| part.ref_var())
from = max(from, self.def_offset(var)); .map(|var| self.def_offset(var))
} .fold(self.last_ordered, max)
}
from
} }
// Get the range in text to be matched by a `unordered:` directive. // Get the range in text to be matched by a `unordered:` directive.