---

yaml
---
r: 2751
b: refs/heads/master
c: b620be9
h: refs/heads/master
i:
  2749: 781386f
  2747: ce76a47
  2743: b57707c
  2735: 7bafdc6
  2719: 3569053
  2687: ce531ef
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2505a2312eeae17cbf261833af5c2cab40f698e2
+refs/heads/master: b620be9cd244368a3a0d354b0dec7e13b4b99527

trunk/src/comp/middle/typeck.rs

@@ -1317,6 +1317,31 @@ mod Pushdown {
                 auto t = Demand::autoderef(scx, e.span, expected,
                     ann_to_type(scx.fcx.ccx.tcx.node_types, ann), adk);
                 write::ty_only_fixup(scx, ann.id, t);
+
+                /* The following is a bit special-cased, but takes care of
+                   the case where we say let @vec[whatever] v = @[]; */
+                auto inner_ty = t;
+                alt (uop) {
+                    case (ast::box(?mut)) {
+                        alt (struct(scx.fcx.ccx.tcx, t)) {
+                            case (ty::ty_box(?inner)) { inner_ty = inner.ty; }
+                            case (_) { 
+                                scx.fcx.ccx.tcx.sess.span_err(e.span,
+                                  "Expecting an application of box"
+                                   + " to have a box type");
+                            }
+                        }
+                    }
+                    case (ast::deref) {
+                        inner_ty = ty::mk_box(scx.fcx.ccx.tcx,
+                        // maybe_mut should work because it'll unify with
+                        // the existing type?
+                                   rec(ty=t, mut=ast::maybe_mut));
+                    }
+                    case (_) { inner_ty = strip_boxes(scx.fcx.ccx.tcx, t); }
+                }
+
+                pushdown_expr(scx, inner_ty, sube);
             }
             case (ast::expr_lit(?lit, ?ann)) {
                 auto t = Demand::simple(scx, e.span, expected,

trunk/src/test/compile-fail/vector-no-ann-2.rs

@@ -0,0 +1,3 @@
+fn main() -> () {
+  let @vec[uint] quux = @[];
+}