Hack to make [] and []/~ the same type in preparation for switching to []/~.

Author: msullivan

src/rustc/middle/ty.rs

@@ -684,7 +684,7 @@ fn mk_nil_ptr(cx: ctxt) -> t {
     mk_ptr(cx, {ty: mk_nil(cx), mutbl: ast::m_imm})
 }
 
-fn mk_vec(cx: ctxt, tm: mt) -> t { mk_t(cx, ty_vec(tm)) }
+fn mk_vec(cx: ctxt, tm: mt) -> t { mk_evec(cx, tm, vstore_uniq) }
 
 fn mk_evec(cx: ctxt, tm: mt, t: vstore) -> t {
     mk_t(cx, ty_evec(tm, t))

src/rustc/middle/typeck.rs

@@ -218,7 +218,7 @@ fn require_same_types(
 
 fn arg_is_argv_ty(_tcx: ty::ctxt, a: ty::arg) -> bool {
     alt ty::get(a.ty).struct {
-      ty::ty_vec(mt) {
+      ty::ty_evec(mt, vstore_uniq) {
         if mt.mutbl != ast::m_imm { ret false; }
         alt ty::get(mt.ty).struct {
           ty::ty_str { ret true; }

src/rustc/middle/typeck/astconv.rs

@@ -170,6 +170,12 @@ fn ast_ty_to_ty<AC: ast_conv, RS: region_scope copy>(
             ret ty::mk_evec(tcx, mt, vst);
           }
 
+          // HACK: if we get a []/~, we assume that it was actually a
+          // [] that got written down, and we throw away the /~...
+          ty::ty_evec(mt, vstore_uniq) {
+            ret ty::mk_evec(tcx, mt, vst);
+          }
+
           ty::ty_str {
             ret ty::mk_estr(tcx, vst);
           }

src/test/compile-fail/fail-type-err.rs

@@ -1,2 +1,2 @@
-// error-pattern:expected `str` but found `[int]`
+// error-pattern:expected `str` but found `[int]/~`
 fn main() { fail [0i]; }