Fix remaining cases of leaking imports

Author: alexcrichton

src/libextra/lib.rs

@@ -34,8 +34,6 @@ Rust extras are part of the standard Rust distribution.
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
 
-use std::str::{StrSlice, OwnedStr};
-
 pub use std::os;
 
 // Utility modules

src/librustc/middle/borrowck/gather_loans/lifetime.rs

@@ -16,6 +16,7 @@
 use middle::borrowck::*;
 use mc = middle::mem_categorization;
 use middle::ty;
+use util::ppaux::Repr;
 use syntax::ast;
 use syntax::codemap::Span;
 

src/librustc/middle/typeck/astconv.rs

@@ -57,6 +57,7 @@ use middle::ty;
 use middle::typeck::rscope;
 use middle::typeck::rscope::{RegionScope};
 use middle::typeck::lookup_def_tcx;
+use util::ppaux::Repr;
 
 use std::vec;
 use syntax::abi::AbiSet;

src/librustc/middle/typeck/check/method.rs

@@ -83,6 +83,7 @@ obtained the type `Foo`, we would never match this method.
 use middle::resolve;
 use middle::ty::*;
 use middle::ty;
+use middle::typeck::astconv::AstConv;
 use middle::typeck::check::{FnCtxt, impl_self_ty};
 use middle::typeck::check::{structurally_resolved_type};
 use middle::typeck::check::vtable;

src/librustc/middle/typeck/check/mod.rs

@@ -107,8 +107,8 @@ use middle::typeck::no_params;
 use middle::typeck::{require_same_types, method_map, vtable_map};
 use middle::lang_items::TypeIdLangItem;
 use util::common::{block_query, indenter, loop_query};
-use util::ppaux::UserString;
 use util::ppaux;
+use util::ppaux::{UserString, Repr};
 
 use std::cell::{Cell, RefCell};
 use std::hashmap::HashMap;

src/librustc/middle/typeck/check/regionck.rs

@@ -31,13 +31,14 @@ this point a bit better.
 use middle::freevars::get_freevars;
 use middle::ty::{ReScope};
 use middle::ty;
+use middle::typeck::astconv::AstConv;
 use middle::typeck::check::FnCtxt;
 use middle::typeck::check::regionmanip::relate_nested_regions;
 use middle::typeck::infer::resolve_and_force_all_but_regions;
 use middle::typeck::infer::resolve_type;
 use middle::typeck::infer;
-use util::ppaux::{ty_to_str, region_to_str};
 use middle::pat_util;
+use util::ppaux::{ty_to_str, region_to_str, Repr};
 
 use syntax::ast::{ManagedSigil, OwnedSigil, BorrowedSigil};
 use syntax::ast::{DefArg, DefBinding, DefLocal, DefSelf, DefUpvar};
@@ -833,14 +834,14 @@ pub mod guarantor {
      * but more special purpose.
      */
 
-
+    use middle::typeck::astconv::AstConv;
     use middle::typeck::check::regionck::Rcx;
     use middle::typeck::check::regionck::mk_subregion_due_to_derefence;
     use middle::typeck::infer;
     use middle::ty;
     use syntax::ast;
     use syntax::codemap::Span;
-    use util::ppaux::{ty_to_str};
+    use util::ppaux::{ty_to_str, Repr};
 
     pub fn for_addr_of(rcx: &mut Rcx, expr: &ast::Expr, base: &ast::Expr) {
         /*!

src/librustc/middle/typeck/check/vtable.rs

@@ -12,6 +12,7 @@
 use middle::ty;
 use middle::ty::{AutoAddEnv, AutoDerefRef, AutoObject, param_ty};
 use middle::ty_fold::TypeFolder;
+use middle::typeck::astconv::AstConv;
 use middle::typeck::check::{FnCtxt, impl_self_ty};
 use middle::typeck::check::{structurally_resolved_type};
 use middle::typeck::infer::fixup_err_to_str;
@@ -23,6 +24,7 @@ use middle::typeck::{param_numbered, param_self, param_index};
 use middle::subst::Subst;
 use util::common::indenter;
 use util::ppaux;
+use util::ppaux::Repr;
 
 use std::cell::RefCell;
 use std::hashmap::HashSet;

src/librustc/middle/typeck/check/writeback.rs

@@ -15,6 +15,7 @@
 
 use middle::pat_util;
 use middle::ty;
+use middle::typeck::astconv::AstConv;
 use middle::typeck::check::{FnCtxt, SelfInfo};
 use middle::typeck::infer::{force_all, resolve_all, resolve_region};
 use middle::typeck::infer::resolve_type;
@@ -25,6 +26,7 @@ use middle::typeck::method_map_entry;
 use middle::typeck::write_substs_to_tcx;
 use middle::typeck::write_ty_to_tcx;
 use util::ppaux;
+use util::ppaux::Repr;
 
 use syntax::ast;
 use syntax::codemap::Span;

src/librustc/middle/typeck/coherence.rs

@@ -34,6 +34,7 @@ use middle::typeck::infer::combine::Combine;
 use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::{new_infer_ctxt, resolve_ivar, resolve_type};
 use middle::typeck::infer;
+use util::ppaux::Repr;
 use syntax::ast::{Crate, DefId, DefStruct, DefTy};
 use syntax::ast::{item, item_enum, item_impl, item_mod, item_struct};
 use syntax::ast::{LOCAL_CRATE, trait_ref, ty_path};

src/librustc/middle/typeck/collect.rs

@@ -42,6 +42,7 @@ use middle::typeck::astconv;
 use middle::typeck::rscope::*;
 use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx};
 use util::ppaux;
+use util::ppaux::Repr;
 
 use std::vec;
 use syntax::abi::AbiSet;