---

yaml
---
r: 16109
b: refs/heads/try
c: 555492e
h: refs/heads/master
i:
  16107: 2ccbfee
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 79b3dedac3f50ec22d9fcab887f29d03ceec9406
+refs/heads/try: 555492e427035caf4a0849580b16130ede6dcf5b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/ast_util.rs

@@ -1,25 +1,25 @@
 import codemap::span;
 import ast::*;
 
-fn spanned<T: copy>(lo: uint, hi: uint, t: T) -> spanned<T> {
+pure fn spanned<T: copy>(lo: uint, hi: uint, t: T) -> spanned<T> {
     respan(mk_sp(lo, hi), t)
 }
 
-fn respan<T: copy>(sp: span, t: T) -> spanned<T> {
+pure fn respan<T: copy>(sp: span, t: T) -> spanned<T> {
     {node: t, span: sp}
 }
 
-fn dummy_spanned<T: copy>(t: T) -> spanned<T> {
+pure fn dummy_spanned<T: copy>(t: T) -> spanned<T> {
     respan(dummy_sp(), t)
 }
 
 /* assuming that we're not in macro expansion */
-fn mk_sp(lo: uint, hi: uint) -> span {
+pure fn mk_sp(lo: uint, hi: uint) -> span {
     {lo: lo, hi: hi, expn_info: none}
 }
 
 // make this a const, once the compiler supports it
-fn dummy_sp() -> span { ret mk_sp(0u, 0u); }
+pure fn dummy_sp() -> span { ret mk_sp(0u, 0u); }
 
 fn path_name(p: @path) -> str { path_name_i(p.idents) }
 

branches/try/src/rustc/middle/trans/alt.rs

@@ -13,6 +13,7 @@ import syntax::print::pprust::pat_to_str;
 import back::abi;
 import resolve::def_map;
 import std::map::hashmap;
+import dvec::{dvec, extensions};
 
 import common::*;
 
@@ -236,12 +237,12 @@ fn enter_uniq(dm: def_map, m: match, col: uint, val: ValueRef) -> match {
 }
 
 fn get_options(ccx: @crate_ctxt, m: match, col: uint) -> [opt] {
-    fn add_to_set(tcx: ty::ctxt, &set: [opt], val: opt) {
-        for vec::each(set) {|l| if opt_eq(tcx, l, val) { ret; } }
-        set += [val];
+    fn add_to_set(tcx: ty::ctxt, &&set: dvec<opt>, val: opt) {
+        if set.any({|l| opt_eq(tcx, l, val)}) {ret;}
+        set.push(val);
     }
 
-    let mut found = [];
+    let found = dvec();
     for vec::each(m) {|br|
         let cur = br.pats[col];
         if pat_is_variant(ccx.tcx.def_map, cur) {
@@ -256,7 +257,7 @@ fn get_options(ccx: @crate_ctxt, m: match, col: uint) -> [opt] {
             }
         }
     }
-    ret found;
+    ret vec::from_mut(dvec::unwrap(found));
 }
 
 fn extract_variant_args(bcx: block, pat_id: ast::node_id,