---

yaml
---
r: 79206
b: refs/heads/master
c: 39ce095
h: refs/heads/master
v: v3

Author: Tim Kuehn

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f883159cdf3a84967513dfb27f004499ac456a1a
+refs/heads/master: 39ce095ebdfcfb35f93b386bcf5a6f0586f78611
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
 refs/heads/try: 4ca1f28cbf6a924013a43617b53c9fa0b97311a6

trunk/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)
                         }