---

yaml
---
r: 31599
b: refs/heads/dist-snap
c: 16a0f72
h: refs/heads/master
i:
  31597: d0d79d7
  31595: 75e9c78
  31591: de8671b
  31583: 264aa4d
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 51b9674ed7af96f31aa164215722710f8d3d9384
+refs/heads/dist-snap: 16a0f72f8ca85b1e2a1b69043dc16c6cf20cc83f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/ty.rs

@@ -3110,35 +3110,50 @@ fn ty_params_to_tys(tcx: ty::ctxt, tps: ~[ast::ty_param]) -> ~[t] {
 
 /// Returns an equivalent type with all the typedefs and self regions removed.
 fn normalize_ty(cx: ctxt, t: t) -> t {
+    fn normalize_mt(cx: ctxt, mt: mt) -> mt {
+        { ty: normalize_ty(cx, mt.ty), mutbl: mt.mutbl }
+    }
+    fn normalize_vstore(vstore: vstore) -> vstore {
+        match vstore {
+            vstore_fixed(*) | vstore_uniq | vstore_box => vstore,
+            vstore_slice(_) => vstore_slice(re_static)
+        }
+    }
+
     alt cx.normalized_cache.find(t) {
       some(t) { return t; }
       none { }
     }
 
-    let t = alt get(t).struct {
-        ty_rptr(region, mt) {
+    let t = match get(t).struct {
+        ty_evec(mt, vstore) =>
+            // This type has a vstore. Get rid of it
+            mk_evec(cx, normalize_mt(cx, mt), normalize_vstore(vstore)),
+
+        ty_rptr(region, mt) =>
             // This type has a region. Get rid of it
-            mk_rptr(cx, re_static, mt)
-        }
-        ty_enum(did, r) {
-            alt r.self_r {
-              some(_) {
-                // This enum has a self region. Get rid of it
-                mk_enum(cx, did, {self_r: none, self_ty: none, tps: r.tps})
-              }
-              none { t }
-            }
-        }
-        ty_class(did, r) {
-            alt r.self_r {
-              some(_) {
+            mk_rptr(cx, re_static, normalize_mt(cx, mt)),
+
+        ty_enum(did, r) =>
+            match r.self_r {
+                some(_) =>
+                    // This enum has a self region. Get rid of it
+                    mk_enum(cx, did, {self_r: none, self_ty: none, tps: r.tps}),
+                none =>
+                    t
+            },
+
+        ty_class(did, r) =>
+            match r.self_r {
+              some(_) =>
                 // Ditto.
-                mk_class(cx, did, {self_r: none, self_ty: none, tps: r.tps})
-              }
-              none { t }
-            }
-        }
-        _ { t }
+                mk_class(cx, did, {self_r: none, self_ty: none, tps: r.tps}),
+              none =>
+                t
+            },
+
+        _ =>
+            t
     };
 
     // FIXME #2187: This also reduced int types to their compatible machine