auto merge of #6545 : catamorphism/rust/unused-import, r=catamorphism

Author: bors

src/librustc/middle/trans/base.rs

@@ -2228,8 +2228,7 @@ pub fn register_fn_fuller(ccx: @CrateContext,
         mangle_exported_name(ccx, /*bad*/copy path, node_type)
     };
 
-    // XXX: Bad copy.
-    let llfn: ValueRef = decl_fn(ccx.llmod, copy ps, cc, llfty);
+    let llfn: ValueRef = decl_fn(ccx.llmod, ps, cc, llfty);
     ccx.item_symbols.insert(node_id, ps);
 
     // FIXME #4404 android JNI hacks

src/librustc/middle/trans/datum.rs

@@ -101,7 +101,6 @@ use middle::ty;
 use util::common::indenter;
 use util::ppaux::ty_to_str;
 
-use core::container::Set; // XXX: this should not be necessary
 use core::to_bytes;
 use syntax::ast;
 use syntax::codemap::span;