---

yaml
---
r: 3047
b: refs/heads/master
c: 8b318be
h: refs/heads/master
i:
  3045: 1809e15
  3043: d16c815
  3039: f534350
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac206068d9288faa9ee35aca3d1f5bb0268f46d4
+refs/heads/master: 8b318be4ce4381a5f7acc1864914e6ba8b0a5af2

trunk/src/comp/middle/typeck.rs

@@ -2216,23 +2216,24 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
 
             check_expr(fcx, idx);
             auto idx_t = expr_ty(fcx.ccx.tcx, idx);
+            if (!type_is_integral(fcx, idx.span, idx_t)) {
+                fcx.ccx.tcx.sess.span_err(idx.span,
+                     "mismatched types: expected integer but found " +
+                     ty_to_str(fcx.ccx.tcx, idx_t));
+            }
+
             alt (structure_of(fcx, expr.span, base_t)) {
                 case (ty::ty_vec(?mt)) {
-                    if (! type_is_integral(fcx, idx.span, idx_t)) {
-                        fcx.ccx.tcx.sess.span_err
-                            (idx.span,
-                             "non-integral type of vec index: "
-                             + ty_to_str(fcx.ccx.tcx, idx_t));
-                    }
+                    write::ty_only_fixup(fcx, a.id, mt.ty);
+                }
+                case (ty::ty_ivec(?mt)) {
                     write::ty_only_fixup(fcx, a.id, mt.ty);
                 }
                 case (ty::ty_str) {
-                    if (! type_is_integral(fcx, idx.span, idx_t)) {
-                        fcx.ccx.tcx.sess.span_err
-                            (idx.span,
-                             "non-integral type of str index: "
-                             + ty_to_str(fcx.ccx.tcx, idx_t));
-                    }
+                    auto typ = ty::mk_mach(fcx.ccx.tcx, common::ty_u8);
+                    write::ty_only_fixup(fcx, a.id, typ);
+                }
+                case (ty::ty_istr) {
                     auto typ = ty::mk_mach(fcx.ccx.tcx, common::ty_u8);
                     write::ty_only_fixup(fcx, a.id, typ);
                 }