auto merge of #7067 : brson/rust/notasktrans, r=graydon

diff --cc src/librustc/middle/trans/base.rs
index f47775f0700a03b2be5761421f6f10607341c624,210daed51b09b44f83fe15eb087c07d64f167fb7..8db838c5d311dd7e0ffc53fd18268b57c216503d
--- 1/src/librustc/middle/trans/base.rs
--- 2/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@@ -3142,11 -3128,8 +3139,10 @@@ pub fn trans_crate(sess: session::Sessi
                tydesc_type: tydesc_type,
                int_type: int_type,
                float_type: float_type,
-               task_type: task_type,
                opaque_vec_type: T_opaque_vec(targ_cfg),
 -              builder: BuilderRef_res(unsafe { llvm::LLVMCreateBuilder() }),
 +              builder: BuilderRef_res(unsafe {
 +                  llvm::LLVMCreateBuilderInContext(llcx)
 +              }),
                shape_cx: mk_ctxt(llmod),
                crate_map: crate_map,
                uses_gc: @mut false,

diff --cc src/librustc/middle/trans/common.rs
Simple merge