---

yaml
---
r: 14403
b: refs/heads/try
c: ff927f1
h: refs/heads/master
i:
  14401: d07baad
  14399: 4e7881e
v: v3

Author: marijnh

[refs]

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

branches/try/src/comp/middle/ty.rs

@@ -1359,17 +1359,14 @@ fn field_idx(id: ast::ident, fields: [field]) -> option<uint> {
 }
 
 fn get_field(rec_ty: t, id: ast::ident) -> field {
-    alt vec::find(get_fields(rec_ty), {|f| str::eq(f.ident, id) }) {
+    alt check vec::find(get_fields(rec_ty), {|f| str::eq(f.ident, id) }) {
       some(f) { f }
-      _ { fail #fmt("get_field: bad field id %s", id); }
     }
 }
 
-// TODO: could have a precondition instead of failing
 fn get_fields(rec_ty:t) -> [field] {
-    alt get(rec_ty).struct {
+    alt check get(rec_ty).struct {
       ty_rec(fields) { fields }
-      _ { fail "get_fields called on non-record type"; }
     }
 }
 
@@ -2080,14 +2077,11 @@ mod unify {
                     let err = terr_record_size(expected_len, actual_len);
                     ret ures_err(err);
                 }
-                // TODO: implement an iterator that can iterate over
-                // two arrays simultaneously.
-
-                let result_fields: [field] = [];
-                let i = 0u;
-                while i < expected_len {
-                    let expected_field = expected_fields[i];
-                    let actual_field = actual_fields[i];
+
+                let result_fields = [], i = 0u;
+                while i < actual_len {
+                    let expected_field = expected_fields[i],
+                        actual_field = actual_fields[i];
                     let u_mut = unify_mut(expected_field.mt.mutbl,
                                           actual_field.mt.mutbl,
                                           variance);
@@ -2127,19 +2121,13 @@ mod unify {
                     let err = terr_tuple_size(expected_len, actual_len);
                     ret ures_err(err);
                 }
-                // TODO: implement an iterator that can iterate over
-                // two arrays simultaneously.
-
-                let result_elems = [];
-                let i = 0u;
-                while i < expected_len {
-                    let expected_elem = expected_elems[i];
-                    let actual_elem = actual_elems[i];
-                    let result = unify_step(
-                        cx, expected_elem, actual_elem, variance);
-                    alt result {
+
+                let result_elems = [], i = 0u;
+                while i < actual_len {
+                    alt unify_step(cx, expected_elems[i], actual_elems[i],
+                                   variance) {
                       ures_ok(rty) { result_elems += [rty]; }
-                      _ { ret result; }
+                      r { ret r; }
                     }
                     i += 1u;
                 }