From fa7772893a63e6ac83ab461f80fb1f35c8633325 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 22 Mar 2013 22:26:32 -0400 Subject: [PATCH] Remove unused imports throughout --- src/libcore/flate.rs | 2 +- src/libcore/logging.rs | 3 +-- src/libcore/rt/io/mod.rs | 3 --- src/libcore/rt/uv/mod.rs | 1 - src/libcore/rt/uvll.rs | 1 - src/librustc/middle/trans/tvec.rs | 1 - src/librustc/middle/typeck/astconv.rs | 1 - src/librustc/middle/typeck/check/mod.rs | 2 +- src/libstd/json.rs | 1 - src/libstd/sort.rs | 4 ---- src/libsyntax/ext/tt/macro_parser.rs | 7 ++----- src/libsyntax/ext/tt/transcribe.rs | 1 - 12 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/libcore/flate.rs b/src/libcore/flate.rs index d9dc89097d0..2ddf9277096 100644 --- a/src/libcore/flate.rs +++ b/src/libcore/flate.rs @@ -17,10 +17,10 @@ Simple compression use libc; use libc::{c_void, size_t, c_int}; use ptr; -use rand::RngUtil; use vec; #[cfg(test)] use rand; +#[cfg(test)] use rand::RngUtil; pub mod rustrt { use libc::{c_int, c_void, size_t}; diff --git a/src/libcore/logging.rs b/src/libcore/logging.rs index be6469abc92..ba976de50ab 100644 --- a/src/libcore/logging.rs +++ b/src/libcore/logging.rs @@ -10,8 +10,6 @@ //! Logging -use libc; - pub mod rustrt { use libc; @@ -49,6 +47,7 @@ pub fn console_off() { pub fn log_type(level: u32, object: &T) { use cast::transmute; use io; + use libc; use repr; use vec; diff --git a/src/libcore/rt/io/mod.rs b/src/libcore/rt/io/mod.rs index f82092b829c..1634e7443b4 100644 --- a/src/libcore/rt/io/mod.rs +++ b/src/libcore/rt/io/mod.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use option::*; -use comm::{GenericPort, GenericChan}; - pub mod file; // FIXME #5370 Strongly want this to be StreamError(&mut Stream) diff --git a/src/libcore/rt/uv/mod.rs b/src/libcore/rt/uv/mod.rs index 28d695273e7..94a3b562fd8 100644 --- a/src/libcore/rt/uv/mod.rs +++ b/src/libcore/rt/uv/mod.rs @@ -42,7 +42,6 @@ use ptr; use libc::{c_void, c_int, size_t, malloc, free, ssize_t}; use cast::{transmute, transmute_mut_region}; use ptr::null; -use sys::size_of; use super::uvll; use super::uvll::*; use unstable::finally::Finally; diff --git a/src/libcore/rt/uvll.rs b/src/libcore/rt/uvll.rs index 5111b2bdc1d..4eaf9dcf40a 100644 --- a/src/libcore/rt/uvll.rs +++ b/src/libcore/rt/uvll.rs @@ -32,7 +32,6 @@ use libc::{size_t, c_int, c_uint, c_void, c_char, uintptr_t}; use libc::{malloc, free}; use prelude::*; -use ptr::to_unsafe_ptr; pub struct uv_err_t { code: c_int, diff --git a/src/librustc/middle/trans/tvec.rs b/src/librustc/middle/trans/tvec.rs index 90f6bf87578..5bb94a18e72 100644 --- a/src/librustc/middle/trans/tvec.rs +++ b/src/librustc/middle/trans/tvec.rs @@ -28,7 +28,6 @@ use util::common::indenter; use util::ppaux::ty_to_str; use core::option::None; -use core::uint; use core::vec; use syntax::ast; use syntax::codemap; diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 5d69ab5766d..a4a5c6ddd21 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -60,7 +60,6 @@ use middle::ty::{ty_param_substs_and_ty}; use middle::ty; use middle::typeck::rscope::{in_binding_rscope}; use middle::typeck::rscope::{region_scope, type_rscope, RegionError}; -use middle::typeck::{CrateCtxt}; use core::result; use core::vec; diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index e216f9266e9..c07dd563cac 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -1328,7 +1328,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt, sugar: ast::CallSugar) { // Index expressions need to be handled separately, to inform them // that they appear in call position. - let mut bot = check_expr(fcx, f); + let mut _bot = check_expr(fcx, f); check_call_or_method(fcx, sp, call_expr_id, diff --git a/src/libstd/json.rs b/src/libstd/json.rs index f39e406bc00..8b8771e989a 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -1202,7 +1202,6 @@ mod tests { use core::result; use core::hashmap::linear::LinearMap; - use core::cmp; fn mk_object(items: &[(~str, Json)]) -> Json { diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index 1dc990526f0..8a239e8b6d8 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -725,8 +725,6 @@ fn copy_vec(dest: &mut [T], s1: uint, #[cfg(test)] mod test_qsort3 { - use core::prelude::*; - use sort::*; use core::vec; @@ -770,8 +768,6 @@ mod test_qsort3 { #[cfg(test)] mod test_qsort { - use core::prelude::*; - use sort::*; use core::int; diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 688d7a57d91..70b639d6648 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -19,11 +19,8 @@ use parse::parser::Parser; use parse::token::{Token, EOF, to_str, nonterminal}; use parse::token; -use core::option::{Option, Some, None}; -use core::str; -use core::uint; -use core::vec; -use std::oldmap::HashMap; +use core::hashmap::linear::LinearMap; +use core::prelude::*; /* This is an Earley-like parser, without support for in-grammar nonterminals, only by calling out to the main rust parser for named nonterminals (which it diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 49076c74972..a0d90a0c70b 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -20,7 +20,6 @@ use parse::lexer::TokenAndSpan; use core::option; use core::vec; -use std; /* FIXME #2811: figure out how to have a uniquely linked stack, and change to `~` */