---

yaml
---
r: 38069
b: refs/heads/try
c: 856dbac
h: refs/heads/master
i:
  38067: 5375db8
v: v3

Author: Jakub Wieczorek

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 1968cb315af9d128ee4457738fddd1eba275277f
+refs/heads/try: 856dbac56726e34a010d2a74d5e19ef5c3e2ede3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/check_alt.rs

@@ -173,8 +173,7 @@ enum ctor {
     variant(def_id),
     val(const_val),
     range(const_val, const_val),
-    vec(uint),
-    vec_with_tail(uint)
+    vec(uint)
 }
 
 impl ctor : cmp::Eq {
@@ -189,11 +188,8 @@ impl ctor : cmp::Eq {
                 (*cv0_self) == (*cv0_other) && (*cv1_self) == (*cv1_other)
             }
             (vec(n_self), vec(n_other)) => n_self == n_other,
-            (vec_with_tail(n_self), vec_with_tail(n_other)) => {
-                n_self == n_other
-            }
             (single, _) | (variant(_), _) | (val(_), _) |
-            (range(*), _) | (vec(*), _) | (vec_with_tail(*), _) => {
+            (range(*), _) | (vec(*), _) => {
                 false
             }
         }
@@ -328,7 +324,7 @@ fn pat_ctor_id(cx: @AltCheckCtxt, p: @pat) -> Option<ctor> {
       }
       pat_vec(elems, tail) => {
         match tail {
-          Some(_) => Some(vec_with_tail(elems.len())),
+          Some(_) => None,
           None => Some(vec(elems.len()))
         }
       }
@@ -465,7 +461,7 @@ fn ctor_arity(cx: @AltCheckCtxt, ctor: ctor, ty: ty::t) -> uint {
       ty::ty_struct(cid, _) => ty::lookup_struct_fields(cx.tcx, cid).len(),
       ty::ty_unboxed_vec(*) | ty::ty_evec(*) => {
         match ctor {
-          vec(n) | vec_with_tail(n) => n,
+          vec(n) => n,
           _ => 0u
         }
       }
@@ -614,19 +610,12 @@ fn specialize(cx: @AltCheckCtxt, r: ~[@pat], ctor_id: ctor, arity: uint,
       }
       pat_vec(elems, tail) => {
         match ctor_id {
-          vec_with_tail(_) => {
-            if elems.len() >= arity {
-              Some(vec::append(elems.slice(0, arity), vec::tail(r)))
-            } else {
-              None
-            }
-          }
           vec(_) => {
             if elems.len() < arity && tail.is_some() {
               Some(vec::append(
                 vec::append(elems, vec::from_elem(
-                    arity - elems.len(), wild())
-                ),
+                    arity - elems.len(), wild()
+                )),
                 vec::tail(r)
               ))
             } else if elems.len() == arity {