From 39ce095ebdfcfb35f93b386bcf5a6f0586f78611 Mon Sep 17 00:00:00 2001 From: Tim Kuehn Date: Fri, 6 Sep 2013 21:36:48 -0400 Subject: [PATCH] use enumerate in place of 'for ti in range(i, tokens.len()) ... match tokens[ti] ...' --- src/libextra/glob.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libextra/glob.rs b/src/libextra/glob.rs index 6f58102e00a4..d82c1fd35c2c 100644 --- a/src/libextra/glob.rs +++ b/src/libextra/glob.rs @@ -304,11 +304,11 @@ impl Pattern { && is_sep(prev_char.unwrap_or_default('/'))) }; - for ti in range(i, self.tokens.len()) { - match self.tokens[ti] { + for (ti, token) in self.tokens.slice_from(i).iter().enumerate() { + match *token { AnySequence => { loop { - match self.matches_from(prev_char, file, ti + 1, options) { + match self.matches_from(prev_char, file, i + ti + 1, options) { SubPatternDoesntMatch => (), // keep trying m => return m, } @@ -331,7 +331,7 @@ impl Pattern { } let (c, next) = file.slice_shift_char(); - let matches = match self.tokens[ti] { + let matches = match *token { AnyChar => { !require_literal(c) }