auto merge of #5252 : nikomatsakis/rust/issue-5087-make-trait-not-impl-self, r=pcwalton

Two changes:

- The first fixes an inconsistency in coherence whereby extension methods were added to the inherent methods table, but only in cross-crate scenarios.  This causes some minor fallout in tests and so forth.  In one case (comm) I added inherent and trait methods so as to avoid the need to import traits like `GenericPort` just to use a port.

- The second makes objects not implement the associated trait, as discussed in #5087.

r? @pcwalton

2 files changed, 2 insertions, 0 deletions

diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index 603480f907c..0f8463b0b3c 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -35,6 +35,7 @@ use std::net::url;
 use std::{json, semver, getopts};
 use syntax::codemap::spanned;
 use syntax::{ast, attr, codemap, diagnostic, parse, visit};
+use core::container::Map;
 
 mod usage;
 mod util;
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 32f9593d9a6..8cfb216d2a2 100644
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use core::*;
+use core::hash::{Hash, HashUtil, Streaming};
 use core::hashmap::linear::LinearMap;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;