---

yaml
---
r: 46775
b: refs/heads/auto
c: f1a8b58
h: refs/heads/master
i:
  46773: cfaabf7
  46771: 8571f85
  46767: a287296
v: v3

Author: brson

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 876b6ba792f83f1b50d1356e7305f334b5ba2f05
+refs/heads/auto: f1a8b58811da99da00a41c1f6a68f1c83e64c4c2

branches/auto/src/librustc/front/test.rs

@@ -178,14 +178,12 @@ fn is_test_fn(i: @ast::item) -> bool {
 
     fn has_test_signature(i: @ast::item) -> bool {
         match &i.node {
-          &ast::item_fn(ref decl, _, ref generics, _) => {
+          &ast::item_fn(ref decl, _, ref tps, _) => {
             let no_output = match decl.output.node {
                 ast::ty_nil => true,
                 _ => false
             };
-            decl.inputs.is_empty()
-                && no_output
-                && !generics.is_parameterized()
+            decl.inputs.is_empty() && no_output && tps.is_empty()
           }
           _ => false
         }

branches/auto/src/librustc/metadata/encoder.rs

@@ -228,16 +228,14 @@ fn encode_type(ecx: @EncodeContext, ebml_w: writer::Encoder, typ: ty::t) {
 
 fn encode_symbol(ecx: @EncodeContext, ebml_w: writer::Encoder, id: node_id) {
     ebml_w.start_tag(tag_items_data_item_symbol);
-    match ecx.item_symbols.find(&id) {
-        Some(ref x) => {
-            debug!("encode_symbol(id=%?, str=%s)", id, *x);
-            ebml_w.writer.write(str::to_bytes(*x));
-        }
-        None => {
-            ecx.diag.handler().bug(
-                fmt!("encode_symbol: id not found %d", id));
-        }
-    }
+    let sym = match ecx.item_symbols.find(&id) {
+      Some(ref x) => (/*bad*/copy *x),
+      None => {
+        ecx.diag.handler().bug(
+            fmt!("encode_symbol: id not found %d", id));
+      }
+    };
+    ebml_w.writer.write(str::to_bytes(sym));
     ebml_w.end_tag();
 }
 
@@ -266,8 +264,6 @@ fn encode_enum_variant_info(ecx: @EncodeContext, ebml_w: writer::Encoder,
                             path: &[ast_map::path_elt],
                             index: @mut ~[entry<int>],
                             generics: &ast::Generics) {
-    debug!("encode_enum_variant_info(id=%?)", id);
-
     let mut disr_val = 0;
     let mut i = 0;
     let vi = ty::enum_variants(ecx.tcx,

branches/auto/src/librustc/middle/trans/base.rs

@@ -197,7 +197,7 @@ pub fn get_extern_const(externs: ExternMap, llmod: ModuleRef,
 }
 
 pub fn trans_foreign_call(cx: block, externs: ExternMap,
-                          llmod: ModuleRef, name: @str, args: ~[ValueRef]) ->
+                          llmod: ModuleRef, name: @str, args: &[ValueRef]) ->
    ValueRef {
     let _icx = cx.insn_ctxt("trans_foreign_call");
     let n = args.len() as int;
@@ -242,7 +242,7 @@ pub fn bump_ptr(bcx: block, t: ty::t, base: ValueRef, sz: ValueRef) ->
 // @llblobptr is the data part of a enum value; its actual type
 // is meaningless, as it will be cast away.
 pub fn GEP_enum(bcx: block, llblobptr: ValueRef, enum_id: ast::def_id,
-                variant_id: ast::def_id, ty_substs: ~[ty::t],
+                variant_id: ast::def_id, ty_substs: &[ty::t],
                 ix: uint) -> ValueRef {
     let _icx = bcx.insn_ctxt("GEP_enum");
     let ccx = bcx.ccx();
@@ -449,7 +449,7 @@ pub fn set_inline_hint(f: ValueRef) {
     }
 }
 
-pub fn set_inline_hint_if_appr(attrs: ~[ast::attribute],
+pub fn set_inline_hint_if_appr(attrs: &[ast::attribute],
                                llfn: ValueRef) {
     match attr::find_inline_attr(attrs) {
       attr::ia_hint => set_inline_hint(llfn),
@@ -489,7 +489,7 @@ pub fn note_unique_llvm_symbol(ccx: @CrateContext, +sym: ~str) {
 
 
 pub fn get_res_dtor(ccx: @CrateContext, did: ast::def_id,
-                    parent_id: ast::def_id, substs: ~[ty::t])
+                    parent_id: ast::def_id, substs: &[ty::t])
    -> ValueRef {
     let _icx = ccx.insn_ctxt("trans_res_dtor");
     if !substs.is_empty() {
@@ -516,7 +516,7 @@ pub fn get_res_dtor(ccx: @CrateContext, did: ast::def_id,
 }
 
 // Structural comparison: a rather involved form of glue.
-pub fn maybe_name_value(cx: @CrateContext, v: ValueRef, s: ~str) {
+pub fn maybe_name_value(cx: @CrateContext, v: ValueRef, s: &str) {
     if cx.sess.opts.save_temps {
         let _: () = str::as_c_str(s, |buf| {
             unsafe {
@@ -641,7 +641,7 @@ pub fn iter_structural_ty(cx: block, av: ValueRef, t: ty::t,
 
     fn iter_variant(cx: block, a_tup: ValueRef,
                     variant: ty::VariantInfo,
-                    tps: ~[ty::t], tid: ast::def_id,
+                    tps: &[ty::t], tid: ast::def_id,
                     f: val_and_ty_fn) -> block {
         let _icx = cx.insn_ctxt("iter_variant");
         if variant.args.len() == 0u { return cx; }
@@ -916,7 +916,7 @@ pub fn have_cached_lpad(bcx: block) -> bool {
     return res;
 }
 
-pub fn in_lpad_scope_cx(bcx: block, f: fn(&mut scope_info)) {
+pub fn in_lpad_scope_cx(bcx: block, f: fn(+si: &mut scope_info)) {
     let mut bcx = bcx;
     loop {
         {
@@ -1652,7 +1652,7 @@ pub fn new_fn_ctxt(ccx: @CrateContext,
 // field of the fn_ctxt with
 pub fn create_llargs_for_fn_args(cx: fn_ctxt,
                                  ty_self: self_arg,
-                                 args: ~[ast::arg]) -> ~[ValueRef] {
+                                 args: &[ast::arg]) -> ~[ValueRef] {
     let _icx = cx.insn_ctxt("create_llargs_for_fn_args");
 
     match ty_self {
@@ -1865,7 +1865,7 @@ pub fn trans_fn(ccx: @CrateContext,
     debug!("trans_fn(ty_self=%?)", ty_self);
     let _icx = ccx.insn_ctxt("trans_fn");
     ccx.stats.n_fns += 1;
-    let the_path_str = path_str(ccx.sess, path);
+    let the_path_str = path_str(ccx.sess, &path);
     trans_closure(ccx, path, decl, body, llfndecl, ty_self,
                   param_substs, id, impl_id,
                   |fcx| {
@@ -1883,7 +1883,7 @@ pub fn trans_fn(ccx: @CrateContext,
 pub fn trans_enum_variant(ccx: @CrateContext,
                           enum_id: ast::node_id,
                           variant: ast::variant,
-                          args: ~[ast::variant_arg],
+                          args: &[ast::variant_arg],
                           disr: int,
                           is_degen: bool,
                           param_substs: Option<@param_substs>,
@@ -1946,7 +1946,7 @@ pub fn trans_enum_variant(ccx: @CrateContext,
 // NB: In theory this should be merged with the function above. But the AST
 // structures are completely different, so very little code would be shared.
 pub fn trans_tuple_struct(ccx: @CrateContext,
-                          fields: ~[@ast::struct_field],
+                          fields: &[@ast::struct_field],
                           ctor_id: ast::node_id,
                           param_substs: Option<@param_substs>,
                           llfndecl: ValueRef) {
@@ -2079,15 +2079,15 @@ pub fn trans_item(ccx: @CrateContext, item: ast::item) {
         _ => fail!(~"trans_item"),
     };
     match /*bad*/copy item.node {
-      ast::item_fn(ref decl, purity, ref generics, ref body) => {
+      ast::item_fn(ref decl, purity, ref tps, ref body) => {
         if purity == ast::extern_fn  {
             let llfndecl = get_item_val(ccx, item.id);
             foreign::trans_foreign_fn(ccx,
                                      vec::append(
                                          /*bad*/copy *path,
                                          ~[path_name(item.ident)]),
                                       decl, body, llfndecl, item.id);
-        } else if !generics.is_type_parameterized() {
+        } else if tps.is_empty() {
             let llfndecl = get_item_val(ccx, item.id);
             trans_fn(ccx,
                      vec::append(/*bad*/copy *path, ~[path_name(item.ident)]),
@@ -2111,8 +2111,8 @@ pub fn trans_item(ccx: @CrateContext, item: ast::item) {
       ast::item_mod(ref m) => {
         trans_mod(ccx, m);
       }
-      ast::item_enum(ref enum_definition, ref generics) => {
-        if !generics.is_type_parameterized() {
+      ast::item_enum(ref enum_definition, ref tps) => {
+        if tps.is_empty() {
             let degen = (*enum_definition).variants.len() == 1u;
             let vi = ty::enum_variants(ccx.tcx, local_def(item.id));
             let mut i = 0;
@@ -2128,8 +2128,8 @@ pub fn trans_item(ccx: @CrateContext, item: ast::item) {
         };
         foreign::trans_foreign_mod(ccx, foreign_mod, abi);
       }
-      ast::item_struct(struct_def, generics) => {
-        if !generics.is_type_parameterized() {
+      ast::item_struct(struct_def, tps) => {
+        if tps.is_empty() {
             trans_struct_def(ccx, struct_def, path, item.id);
         }
       }
@@ -2847,7 +2847,7 @@ pub fn trap(bcx: block) {
     }
 }
 
-pub fn decl_gc_metadata(ccx: @CrateContext, llmod_id: ~str) {
+pub fn decl_gc_metadata(ccx: @CrateContext, llmod_id: &str) {
     if !ccx.sess.opts.gc || !*ccx.uses_gc {
         return;
     }
@@ -3014,7 +3014,7 @@ pub fn trans_crate(sess: session::Session,
                    tcx: ty::ctxt,
                    output: &Path,
                    emap2: resolve::ExportMap2,
-                   maps: astencode::Maps) -> (ModuleRef, LinkMeta) {
+                   +maps: astencode::Maps) -> (ModuleRef, LinkMeta) {
 
     let symbol_hasher = @hash::default_state();
     let link_meta =

branches/auto/src/librustc/middle/trans/build.rs

@@ -117,7 +117,7 @@ pub fn Ret(cx: block, V: ValueRef) {
     }
 }
 
-pub fn AggregateRet(cx: block, RetVals: ~[ValueRef]) {
+pub fn AggregateRet(cx: block, RetVals: &[ValueRef]) {
     if cx.unreachable { return; }
     check_not_terminated(cx);
     terminate(cx, "AggregateRet");
@@ -184,7 +184,7 @@ pub fn noname() -> *libc::c_char {
     }
 }
 
-pub fn Invoke(cx: block, Fn: ValueRef, Args: ~[ValueRef],
+pub fn Invoke(cx: block, Fn: ValueRef, Args: &[ValueRef],
               Then: BasicBlockRef, Catch: BasicBlockRef) {
     if cx.unreachable { return; }
     check_not_terminated(cx);
@@ -202,7 +202,7 @@ pub fn Invoke(cx: block, Fn: ValueRef, Args: ~[ValueRef],
     }
 }
 
-pub fn FastInvoke(cx: block, Fn: ValueRef, Args: ~[ValueRef],
+pub fn FastInvoke(cx: block, Fn: ValueRef, Args: &[ValueRef],
                   Then: BasicBlockRef, Catch: BasicBlockRef) {
     if cx.unreachable { return; }
     check_not_terminated(cx);
@@ -567,7 +567,7 @@ pub fn Store(cx: block, Val: ValueRef, Ptr: ValueRef) {
     }
 }
 
-pub fn GEP(cx: block, Pointer: ValueRef, Indices: ~[ValueRef]) -> ValueRef {
+pub fn GEP(cx: block, Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {
     unsafe {
         if cx.unreachable { return llvm::LLVMGetUndef(T_ptr(T_nil())); }
         count_insn(cx, "gep");
@@ -810,7 +810,7 @@ pub fn EmptyPhi(cx: block, Ty: TypeRef) -> ValueRef {
     }
 }
 
-pub fn Phi(cx: block, Ty: TypeRef, vals: ~[ValueRef], bbs: ~[BasicBlockRef])
+pub fn Phi(cx: block, Ty: TypeRef, vals: &[ValueRef], bbs: &[BasicBlockRef])
     -> ValueRef {
     unsafe {
         if cx.unreachable { return llvm::LLVMGetUndef(Ty); }
@@ -844,11 +844,10 @@ pub fn _UndefReturn(cx: block, Fn: ValueRef) -> ValueRef {
     }
 }
 
-pub fn add_span_comment(bcx: block, sp: span, text: ~str) {
+pub fn add_span_comment(bcx: block, sp: span, text: &str) {
     let ccx = bcx.ccx();
     if !ccx.sess.no_asm_comments() {
-        let s = text + ~" (" + ccx.sess.codemap.span_to_str(sp)
-            + ~")";
+        let s = fmt!("%s (%s)", text, ccx.sess.codemap.span_to_str(sp));
         log(debug, copy s);
         add_comment(bcx, s);
     }
@@ -888,7 +887,7 @@ pub fn Call(cx: block, Fn: ValueRef, Args: &[ValueRef]) -> ValueRef {
     }
 }
 
-pub fn FastCall(cx: block, Fn: ValueRef, Args: ~[ValueRef]) -> ValueRef {
+pub fn FastCall(cx: block, Fn: ValueRef, Args: &[ValueRef]) -> ValueRef {
     if cx.unreachable { return _UndefReturn(cx, Fn); }
     unsafe {
         count_insn(cx, "fastcall");
@@ -899,7 +898,7 @@ pub fn FastCall(cx: block, Fn: ValueRef, Args: ~[ValueRef]) -> ValueRef {
     }
 }
 
-pub fn CallWithConv(cx: block, Fn: ValueRef, Args: ~[ValueRef],
+pub fn CallWithConv(cx: block, Fn: ValueRef, Args: &[ValueRef],
                     Conv: CallConv) -> ValueRef {
     if cx.unreachable { return _UndefReturn(cx, Fn); }
     unsafe {

branches/auto/src/librustc/middle/trans/callee.rs

@@ -187,7 +187,7 @@ pub fn trans_fn_ref_with_vtables_to_callee(
         bcx: block,
         def_id: ast::def_id,
         ref_id: ast::node_id,
-        +type_params: ~[ty::t],
+        type_params: &[ty::t],
         vtables: Option<typeck::vtable_res>)
      -> Callee {
     Callee {bcx: bcx,
@@ -199,7 +199,7 @@ pub fn trans_fn_ref_with_vtables(
         bcx: block,            //
         def_id: ast::def_id,   // def id of fn
         ref_id: ast::node_id,  // node id of use of fn; may be zero if N/A
-        +type_params: ~[ty::t], // values for fn's ty params
+        type_params: &[ty::t], // values for fn's ty params
         vtables: Option<typeck::vtable_res>)
      -> FnData {
     //!
@@ -378,7 +378,7 @@ pub fn trans_lang_call(bcx: block,
 pub fn trans_lang_call_with_type_params(bcx: block,
                                         did: ast::def_id,
                                         args: &[ValueRef],
-                                        type_params: ~[ty::t],
+                                        type_params: &[ty::t],
                                         dest: expr::Dest)
     -> block {
     let fty;
@@ -394,7 +394,7 @@ pub fn trans_lang_call_with_type_params(bcx: block,
         |bcx| {
             let callee =
                 trans_fn_ref_with_vtables_to_callee(bcx, did, 0,
-                                                    copy type_params,
+                                                    type_params,
                                                     None);
 
             let new_llval;
@@ -636,8 +636,8 @@ pub enum AutorefArg {
 pub fn trans_arg_expr(bcx: block,
                       formal_ty: ty::arg,
                       arg_expr: @ast::expr,
-                      temp_cleanups: &mut ~[ValueRef],
-                      ret_flag: Option<ValueRef>,
+                      +temp_cleanups: &mut ~[ValueRef],
+                      +ret_flag: Option<ValueRef>,
                       +autoref_arg: AutorefArg) -> Result {
     let _icx = bcx.insn_ctxt("trans_arg_expr");
     let ccx = bcx.ccx();