---

yaml
---
r: 67005
b: refs/heads/master
c: 3b158b3
h: refs/heads/master
i:
  67003: 0caa55e
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 30ef79ca6d069e3cc100e3d1332a286cbbc1eab3
+refs/heads/master: 3b158b3e425b8adb42eab076acc9962bb22783ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

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

@@ -1612,7 +1612,6 @@ pub fn new_fn_ctxt_w_id(ccx: @mut CrateContext,
                         llfndecl: ValueRef,
                         id: ast::node_id,
                         output_type: ty::t,
-                        skip_retptr: bool,
                         param_substs: Option<@param_substs>,
                         sp: Option<span>)
                      -> fn_ctxt {
@@ -1656,7 +1655,7 @@ pub fn new_fn_ctxt_w_id(ccx: @mut CrateContext,
     fcx.llenv = unsafe {
           llvm::LLVMGetParam(llfndecl, fcx.env_arg_pos() as c_uint)
     };
-    if !ty::type_is_nil(substd_output_type) && !(is_immediate && skip_retptr) {
+    if !ty::type_is_nil(substd_output_type) {
         fcx.llretptr = Some(make_return_pointer(fcx, substd_output_type));
     }
     fcx
@@ -1668,7 +1667,7 @@ pub fn new_fn_ctxt(ccx: @mut CrateContext,
                    output_type: ty::t,
                    sp: Option<span>)
                 -> fn_ctxt {
-    new_fn_ctxt_w_id(ccx, path, llfndecl, -1, output_type, false, None, sp)
+    new_fn_ctxt_w_id(ccx, path, llfndecl, -1, output_type, None, sp)
 }
 
 // NB: must keep 4 fns in sync:
@@ -1862,7 +1861,6 @@ pub fn trans_closure(ccx: @mut CrateContext,
                                llfndecl,
                                id,
                                output_type,
-                               false,
                                param_substs,
                                Some(body.span));
     let raw_llargs = create_llargs_for_fn_args(fcx, self_arg, decl.inputs);
@@ -2081,7 +2079,6 @@ pub fn trans_enum_variant_or_tuple_like_struct<A:IdAndTy>(
                                llfndecl,
                                ctor_id,
                                result_ty,
-                               false,
                                param_substs,
                                None);
 

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

@@ -17,7 +17,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[allow(non_implicitly_copyable_typarams)];
 #[deny(deprecated_pattern)];
 
 extern mod extra;

trunk/src/librustc/rustc.rs

@@ -43,7 +43,6 @@ impl Clone for Ctxt {
     }
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 fn run(srv: astsrv::Srv, doc: doc::Doc) -> doc::Doc {
     let ctxt = Ctxt {
         srv: srv,
@@ -66,7 +65,6 @@ fn fold_item(fold: &fold::Fold<Ctxt>, doc: doc::ItemDoc) -> doc::ItemDoc {
     }
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 fn fold_mod(fold: &fold::Fold<Ctxt>, doc: doc::ModDoc) -> doc::ModDoc {
     let is_topmod = doc.id() == ast::crate_node_id;
 

trunk/src/librustdoc/path_pass.rs

@@ -19,8 +19,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[allow(non_implicitly_copyable_typarams)];
-
 extern mod extra;
 extern mod rustc;
 extern mod syntax;

trunk/src/librustdoc/rustdoc.rs

@@ -42,7 +42,6 @@ pub fn mk_pass(name: ~str, lteq: ItemLtEqOp) -> Pass {
     }
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 fn run(
     _srv: astsrv::Srv,
     doc: doc::Doc,
@@ -55,7 +54,6 @@ fn run(
     (fold.fold_doc)(&fold, doc)
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 fn fold_mod(
     fold: &fold::Fold<ItemLtEq>,
     doc: doc::ModDoc

trunk/src/librustdoc/sort_pass.rs

@@ -44,7 +44,6 @@ impl Clone for WrappedOp {
     }
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 fn run(
     _srv: astsrv::Srv,
     doc: doc::Doc,

trunk/src/librustdoc/text_pass.rs

@@ -20,7 +20,6 @@ use print::pprust;
 use visit;
 use syntax::parse::token::special_idents;
 
-use std::cmp;
 use std::hashmap::HashMap;
 use std::vec;
 

trunk/src/libsyntax/ast_map.rs

@@ -16,8 +16,6 @@ use opt_vec;
 use parse::token;
 use visit;
 
-use std::cast::unsafe_copy;
-use std::cast;
 use std::hashmap::HashMap;
 use std::int;
 use std::local_data;

trunk/src/libsyntax/ast_util.rs

@@ -2713,7 +2713,6 @@ impl Parser {
           token::LBRACE => {
             self.bump();
             let (_, _) = self.parse_pat_fields();
-            hi = self.span.hi;
             self.bump();
             self.obsolete(*self.span, ObsoleteRecordPattern);
             pat = pat_wild;
@@ -2744,7 +2743,6 @@ impl Parser {
                     }
                 }
                 if fields.len() == 1 { self.expect(&token::COMMA); }
-                hi = self.span.hi;
                 self.expect(&token::RPAREN);
                 pat = pat_tup(fields);
             }
@@ -2760,7 +2758,6 @@ impl Parser {
             self.bump();
             let (before, slice, after) =
                 self.parse_pat_vec_elements();
-            hi = self.span.hi;
             self.expect(&token::RBRACKET);
             pat = ast::pat_vec(before, slice, after);
             hi = self.last_span.hi;
@@ -4654,7 +4651,7 @@ impl Parser {
 
     pub fn parse_item(&self, attrs: ~[attribute]) -> Option<@ast::item> {
         match self.parse_item_or_view_item(attrs, true) {
-            iovi_none(attrs) =>
+            iovi_none(_) =>
                 None,
             iovi_view_item(_) =>
                 self.fatal("view items are not allowed here"),
@@ -4824,7 +4821,6 @@ impl Parser {
         // First, parse view items.
         let mut view_items : ~[ast::view_item] = ~[];
         let mut items = ~[];
-        let mut done = false;
         // I think this code would probably read better as a single
         // loop with a mutable three-state-variable (for extern mods,
         // view items, and regular items) ... except that because