---

yaml
---
r: 44861
b: refs/heads/master
c: 4c35a00
h: refs/heads/master
i:
  44859: 6828587
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ca9549bdfc3dd969e9182d58038f90bbef026ded
+refs/heads/master: 4c35a0089377bc8572ad0fe356c64e00ed16c51b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/trans/callee.rs

@@ -39,6 +39,7 @@ use middle::trans::inline;
 use middle::trans::meth;
 use middle::trans::monomorphize;
 use middle::trans::type_of;
+use middle::ty::ty_to_str;
 use middle::ty;
 use middle::typeck;
 use util::common::indenter;
@@ -730,7 +731,7 @@ pub fn trans_arg_expr(bcx: block,
 
                     ast::by_copy => {
                         debug!("by copy arg with type %s, storing to scratch",
-                               bcx.ty_to_str(arg_datum.ty));
+                               ty_to_str(ccx.tcx, arg_datum.ty));
                         let scratch = scratch_datum(bcx, arg_datum.ty, false);
 
                         arg_datum.store_to_datum(bcx, arg_expr.id,

trunk/src/libsyntax/ext/auto_encode.rs

@@ -460,8 +460,8 @@ fn mk_impl(
     let ty = cx.ty_path(
         span,
         ~[ident],
-        opt_vec::take_vec(generics.ty_params.map(
-            |tp| cx.ty_path(span, ~[tp.ident], ~[])))
+        generics.ty_params.map(
+            |tp| cx.ty_path(span, ~[tp.ident], ~[])).to_vec()
     );
 
     let generics = ast::Generics {

trunk/src/libsyntax/ext/pipes/ast_builder.rs

@@ -394,15 +394,13 @@ impl ext_ctxt_ast_builder for ext_ctxt {
     }
 
     fn ty_vars(&self, ty_params: &OptVec<ast::TyParam>) -> ~[@ast::Ty] {
-        opt_vec::take_vec(
-            ty_params.map(|p| self.ty_path_ast_builder(
-                path(~[p.ident], dummy_sp()))))
+        ty_params.map(|p| self.ty_path_ast_builder(
+            path(~[p.ident], dummy_sp()))).to_vec()
     }
 
     fn ty_vars_global(&self,
                       ty_params: &OptVec<ast::TyParam>) -> ~[@ast::Ty] {
-        opt_vec::take_vec(
-            ty_params.map(|p| self.ty_path_ast_builder(
-                path(~[p.ident], dummy_sp()))))
+        ty_params.map(|p| self.ty_path_ast_builder(
+            path(~[p.ident], dummy_sp()))).to_vec()
     }
 }

trunk/src/libsyntax/opt_vec.rs

@@ -31,14 +31,6 @@ pub fn with<T>(+t: T) -> OptVec<T> {
     Vec(~[t])
 }
 
-pub fn from<T>(+t: ~[T]) -> OptVec<T> {
-    if t.len() == 0 {
-        Empty
-    } else {
-        Vec(t)
-    }
-}
-
 impl<T> OptVec<T> {
     fn push(&mut self, +t: T) {
         match *self {
@@ -78,12 +70,12 @@ impl<T> OptVec<T> {
             Vec(ref v) => v.len()
         }
     }
-}
 
-pub fn take_vec<T>(+v: OptVec<T>) -> ~[T] {
-    match v {
-        Empty => ~[],
-        Vec(v) => v
+    pure fn to_vec(self) -> ~[T] {
+        match self {
+            Empty => ~[],
+            Vec(v) => v
+        }
     }
 }
 

trunk/src/libsyntax/parse/parser.rs

@@ -1157,7 +1157,7 @@ pub impl Parser {
                     let remaining_exprs =
                         self.parse_seq_to_end(token::RBRACKET,
                             seq_sep_trailing_allowed(token::COMMA),
-                            |p| p.parse_expr());
+                            |p| p.parse_expr()).to_vec();
                     ex = expr_vec(~[first_expr] + remaining_exprs, mutbl);
                 } else {
                     // Vector with one element.
@@ -1419,7 +1419,7 @@ pub impl Parser {
                 vec::append(
                     self.parse_seq_to_before_end(
                         ket, seq_sep_none(),
-                        |p| p.parse_token_tree()),
+                        |p| p.parse_token_tree()).to_vec(),
                     // the close delimiter:
                     ~[parse_any_tt_tok(self)])))
           }
@@ -2727,7 +2727,7 @@ pub impl Parser {
         let result = self.parse_seq_to_gt(
             Some(token::COMMA),
             |p| p.parse_ty(false));
-        opt_vec::take_vec(result)
+        result.to_vec()
     }
 
     fn parse_fn_decl(parse_arg_fn: fn(Parser) -> arg_or_capture_item)
@@ -2819,7 +2819,7 @@ pub impl Parser {
                     args_or_capture_items =
                         self.parse_seq_to_before_end(token::RPAREN,
                                                      sep,
-                                                     parse_arg_fn);
+                                                     parse_arg_fn).to_vec();
                 }
                 token::RPAREN => {
                     args_or_capture_items = ~[];
@@ -2835,7 +2835,7 @@ pub impl Parser {
             args_or_capture_items =
                 self.parse_seq_to_before_end(token::RPAREN,
                                              sep,
-                                             parse_arg_fn);
+                                             parse_arg_fn).to_vec();
         }
 
         self.expect(token::RPAREN);
@@ -3032,7 +3032,7 @@ pub impl Parser {
     fn parse_trait_ref_list(ket: token::Token) -> ~[@trait_ref] {
         self.parse_seq_to_before_end(
             ket, seq_sep_none(),
-            |p| p.parse_trait_ref())
+            |p| p.parse_trait_ref()).to_vec()
     }
 
     fn parse_item_struct() -> item_info {

trunk/src/snapshots.txt

@@ -1,5 +1,5 @@
 S 2013-02-27 a6d9689
-  freebsd-x86_64 d33b5ebbf3335f6a8a5cc23572f630ad66539830
+  freebsd-x86_64 683f329fe589af854f9a375405468691d98015ac
   linux-i386 22f5c2a91941735007ed804586fc0f0e82fc3601
   linux-x86_64 328fb144edbed8cabb8c2c6306304e3d8460ef60
   macos-i386 5dda51347f9aba4c70a0890d3ec084d98a49c015