---

yaml
---
r: 15775
b: refs/heads/try
c: 5af58e7
h: refs/heads/master
i:
  15773: 0a346b4
  15771: 15dc37c
  15767: 470a3d2
  15759: 49da4b8
  15743: b40eacf
v: v3

Author: paulstansifer

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fa6c18e0149c9e31a69c9084c416ea5c7cd363dd
+refs/heads/try: 5af58e79269600c962f1de3bee57e804a36695a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/path.rs

@@ -251,7 +251,7 @@ fn normalize(p: path) -> path {
         let mut t = [];
         let mut i = vec::len(s);
         let mut skip = 0;
-        do {
+        while i != 0u {
             i -= 1u;
             if s[i] == ".." {
                 skip += 1;
@@ -262,7 +262,7 @@ fn normalize(p: path) -> path {
                     skip -= 1;
                 }
             }
-        } while i != 0u;
+        }
         let mut t = vec::reversed(t);
         while skip > 0 {
             t += [".."];

branches/try/src/rustc/metadata/tydecode.rs

@@ -69,10 +69,11 @@ fn parse_constrs(st: @pstate, conv: conv_did) -> [@ty::constr] {
     let mut rslt: [@ty::constr] = [];
     alt peek(st) {
       ':' {
-        do  {
+        loop {
             next(st);
             rslt += [parse_constr(st, conv, parse_constr_arg)];
-        } while peek(st) == ';'
+            if peek(st) != ';' { break; }
+        }
       }
       _ { }
     }
@@ -84,10 +85,11 @@ fn parse_ty_constrs(st: @pstate, conv: conv_did) -> [@ty::type_constr] {
     let mut rslt: [@ty::type_constr] = [];
     alt peek(st) {
       ':' {
-        do  {
+        loop {
             next(st);
             rslt += [parse_constr(st, conv, parse_ty_constr_arg)];
-        } while peek(st) == ';'
+            if peek(st) != ';' { break; }
+        }
       }
       _ { }
     }
@@ -154,12 +156,13 @@ fn parse_constr<T: copy>(st: @pstate, conv: conv_did,
     assert (ignore == '(');
     let def = parse_def(st, conv);
     let mut an_arg: constr_arg_general_<T>;
-    do  {
+    loop {
         an_arg = pser(st);
         // FIXME use a real span
         args += [@respan(sp, an_arg)];
         ignore = next(st);
-    } while ignore == ';'
+        if ignore != ';' { break; }
+    }
     assert (ignore == ')');
     ret @respan(sp, {path: pth, args: args, id: def});
 }