Skip to content

Commit 398bc66

Browse files
committed
Remove unused trait imports flagged by lint
1 parent 672a3d9 commit 398bc66

File tree

34 files changed

+13
-43
lines changed

34 files changed

+13
-43
lines changed

src/libcore/num/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use self::wrapping::OverflowingOps;
1717

1818
use char::CharExt;
19-
use cmp::{Eq, PartialOrd};
19+
use cmp::PartialOrd;
2020
use convert::From;
2121
use fmt;
2222
use intrinsics;

src/libcore/option.rs

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
use self::Option::*;
147147

148148
use clone::Clone;
149-
use cmp::{Eq, Ord};
150149
use default::Default;
151150
use iter::ExactSizeIterator;
152151
use iter::{Iterator, DoubleEndedIterator, FromIterator, IntoIterator};

src/libcore/str/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use self::pattern::{Searcher, ReverseSearcher, DoubleEndedSearcher};
1919

2020
use char::{self, CharExt};
2121
use clone::Clone;
22-
use cmp::Eq;
2322
use convert::AsRef;
2423
use default::Default;
2524
use fmt;
@@ -1180,7 +1179,6 @@ Section: Trait implementations
11801179
mod traits {
11811180
use cmp::{self, Ordering, Ord, PartialEq, PartialOrd, Eq};
11821181
use cmp::Ordering::{Less, Greater};
1183-
use iter::Iterator;
11841182
use option::Option;
11851183
use option::Option::Some;
11861184
use ops;

src/librustc/lint/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use middle::privacy::AccessLevels;
2929
use middle::ty::{self, Ty};
3030
use session::{early_error, Session};
3131
use lint::{Level, LevelSource, Lint, LintId, LintArray, LintPass};
32-
use lint::{EarlyLintPass, EarlyLintPassObject, LateLintPass, LateLintPassObject};
32+
use lint::{EarlyLintPassObject, LateLintPass, LateLintPassObject};
3333
use lint::{Default, CommandLine, Node, Allow, Warn, Deny, Forbid};
3434
use lint::builtin;
3535
use util::nodemap::FnvHashMap;

src/librustc/middle/dead.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use lint;
2222

2323
use std::collections::HashSet;
2424
use syntax::{ast, codemap};
25-
use syntax::attr::{self, AttrMetaMethods};
25+
use syntax::attr;
2626

2727
// Any local node that may call something in its body block should be
2828
// explored. For example, if it's a live NodeItem that is a

src/librustc/middle/implicator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use middle::infer::{InferCtxt, GenericKind};
1515
use middle::subst::Substs;
1616
use middle::traits;
1717
use middle::ty::{self, RegionEscape, ToPredicate, Ty};
18-
use middle::ty::fold::{TypeFoldable, TypeFolder};
18+
use middle::ty::fold::TypeFoldable;
1919

2020
use syntax::ast;
2121
use syntax::codemap::Span;

src/librustc/middle/infer/combine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use middle::ty::{IntType, UintType};
4646
use middle::ty::{self, Ty};
4747
use middle::ty::error::TypeError;
4848
use middle::ty::fold::{TypeFolder, TypeFoldable};
49-
use middle::ty::relate::{Relate, RelateResult, TypeRelation};
49+
use middle::ty::relate::{RelateResult, TypeRelation};
5050

5151
use syntax::ast;
5252
use syntax::codemap::Span;

src/librustc/middle/infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use middle::ty::adjustment;
3333
use middle::ty::{TyVid, IntVid, FloatVid, RegionVid};
3434
use middle::ty::{self, Ty, HasTypeFlags};
3535
use middle::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
36-
use middle::ty::fold::{TypeFolder, TypeFoldable};
36+
use middle::ty::fold::TypeFoldable;
3737
use middle::ty::relate::{Relate, RelateResult, TypeRelation};
3838
use rustc_data_structures::unify::{self, UnificationTable};
3939
use std::cell::{RefCell, Ref};

src/librustc/middle/ty/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ use middle::lang_items::{FnTraitLangItem, FnMutTraitLangItem, FnOnceTraitLangIte
2929
use middle::subst::{self, ParamSpace, Subst, Substs, VecPerParamSpace};
3030
use middle::traits;
3131
use middle::ty;
32-
use middle::ty::fold::TypeFolder;
3332
use middle::ty::walk::TypeWalker;
3433
use util::common::memoized;
3534
use util::nodemap::{NodeMap, NodeSet, DefIdMap};
3635
use util::nodemap::FnvHashMap;
3736

3837
use serialize::{Encodable, Encoder, Decodable, Decoder};
39-
use std::borrow::{Borrow, Cow};
38+
use std::borrow::Cow;
4039
use std::cell::{Cell, RefCell};
4140
use std::hash::{Hash, Hasher};
4241
use std::iter;

src/librustc/middle/ty/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use std::cmp;
2828
use std::hash::{Hash, SipHasher, Hasher};
2929
use std::rc::Rc;
3030
use syntax::ast::{self, Name};
31-
use syntax::attr::{self, AttrMetaMethods, SignedInt, UnsignedInt};
31+
use syntax::attr::{self, SignedInt, UnsignedInt};
3232
use syntax::codemap::Span;
3333

3434
use rustc_front::hir;

src/librustc/session/filesearch.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub use self::FileMatch::*;
1515
use std::collections::HashSet;
1616
use std::env;
1717
use std::fs;
18-
use std::io::prelude::*;
1918
use std::path::{Path, PathBuf};
2019

2120
use session::search_paths::{SearchPaths, PathKind};

src/librustc_lint/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use std::cmp;
2222
use std::{i8, i16, i32, i64, u8, u16, u32, u64, f32, f64};
2323

2424
use syntax::{abi, ast};
25-
use syntax::attr::{self, AttrMetaMethods};
25+
use syntax::attr;
2626
use syntax::codemap::{self, Span};
2727
use syntax::feature_gate::{emit_feature_err, GateIssue};
2828
use syntax::ast::{TyIs, TyUs, TyI8, TyU8, TyI16, TyU16, TyI32, TyU32, TyI64, TyU64};

src/librustc_metadata/encoder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use std::u32;
4343
use syntax::abi;
4444
use syntax::ast::{self, NodeId, Name, CRATE_NODE_ID, CrateNum};
4545
use syntax::attr;
46-
use syntax::attr::AttrMetaMethods;
4746
use syntax::diagnostic::SpanHandler;
4847
use syntax::parse::token::special_idents;
4948
use syntax;

src/librustc_resolve/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ use rustc::util::nodemap::{NodeMap, DefIdSet, FnvHashMap};
6666
use syntax::ast;
6767
use syntax::ast::{CRATE_NODE_ID, Ident, Name, NodeId, CrateNum, TyIs, TyI8, TyI16, TyI32, TyI64};
6868
use syntax::ast::{TyUs, TyU8, TyU16, TyU32, TyU64, TyF64, TyF32};
69-
use syntax::attr::AttrMetaMethods;
7069
use syntax::parse::token::{self, special_names, special_idents};
7170
use syntax::codemap::{self, Span, Pos};
7271
use syntax::util::lev_distance::{lev_distance, max_suggestion_distance};

src/librustc_resolve/resolve_imports.rs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use rustc::middle::def_id::DefId;
3030
use rustc::middle::privacy::*;
3131

3232
use syntax::ast::{NodeId, Name};
33-
use syntax::attr::AttrMetaMethods;
3433
use syntax::codemap::Span;
3534

3635
use std::mem::replace;

src/librustc_trans/trans/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use trans::type_::Type;
3838
use trans::type_of;
3939
use middle::traits;
4040
use middle::ty::{self, HasTypeFlags, Ty};
41-
use middle::ty::fold::{TypeFolder, TypeFoldable};
41+
use middle::ty::fold::TypeFoldable;
4242
use rustc_front::hir;
4343
use rustc::mir::repr::Mir;
4444
use util::nodemap::{FnvHashMap, NodeMap};

src/librustc_trans/trans/monomorphize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use middle::def_id::DefId;
1616
use middle::infer::normalize_associated_type;
1717
use middle::subst;
1818
use middle::subst::{Subst, Substs};
19-
use middle::ty::fold::{TypeFolder, TypeFoldable};
19+
use middle::ty::fold::TypeFoldable;
2020
use trans::attributes;
2121
use trans::base::{trans_enum_variant, push_ctxt, get_item_val};
2222
use trans::base::trans_fn;

src/librustc_typeck/check/intrinsic.rs

-3
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,15 @@
1111
//! Type-checking for the rust-intrinsic and platform-intrinsic
1212
//! intrinsics that the compiler exposes.
1313
14-
use astconv::AstConv;
1514
use intrinsics;
1615
use middle::subst;
1716
use middle::ty::FnSig;
1817
use middle::ty::{self, Ty};
19-
use middle::ty::fold::TypeFolder;
2018
use {CrateCtxt, require_same_types};
2119

2220
use std::collections::{HashMap};
2321
use syntax::abi;
2422
use syntax::ast;
25-
use syntax::attr::AttrMetaMethods;
2623
use syntax::codemap::Span;
2724
use syntax::parse::token;
2825

src/librustc_typeck/check/method/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
//! Method lookup: the secret sauce of Rust. See `README.md`.
1212
13-
use astconv::AstConv;
1413
use check::FnCtxt;
1514
use middle::def;
1615
use middle::def_id::DefId;

src/librustc_typeck/check/method/suggest.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
1414
use CrateCtxt;
1515

16-
use astconv::AstConv;
1716
use check::{self, FnCtxt};
1817
use front::map as hir_map;
1918
use middle::ty::{self, Ty, ToPolyTraitRef, ToPredicate, HasTypeFlags};

src/librustc_typeck/check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ use middle::ty::{self, HasTypeFlags, RegionEscape, ToPolyTraitRef, Ty};
100100
use middle::ty::{MethodCall, MethodCallee};
101101
use middle::ty::adjustment;
102102
use middle::ty::error::TypeError;
103-
use middle::ty::fold::{TypeFolder, TypeFoldable};
103+
use middle::ty::fold::TypeFoldable;
104104
use middle::ty::util::Representability;
105105
use require_c_abi_if_variadic;
106106
use rscope::{ElisionFailureInfo, RegionScope};

src/librustc_typeck/check/regionck.rs

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
//! relation, except that a borrowed pointer never owns its
8383
//! contents.
8484
85-
use astconv::AstConv;
8685
use check::dropck;
8786
use check::FnCtxt;
8887
use middle::free_region::FreeRegionMap;

src/librustc_typeck/check/wf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use astconv::AstConv;
1211
use check::{FnCtxt, Inherited, blank_fn_ctxt, regionck, wfcheck};
1312
use constrained_type_params::{identify_constrained_type_params, Parameter};
1413
use CrateCtxt;

src/librustc_typeck/check/wfcheck.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use astconv::AstConv;
1211
use check::{FnCtxt, Inherited, blank_fn_ctxt, regionck};
1312
use constrained_type_params::{identify_constrained_type_params, Parameter};
1413
use CrateCtxt;
1514
use middle::def_id::DefId;
1615
use middle::subst::{self, TypeSpace, FnSpace, ParamSpace, SelfSpace};
1716
use middle::traits;
1817
use middle::ty::{self, Ty};
19-
use middle::ty::fold::{TypeFolder};
2018

2119
use std::cell::RefCell;
2220
use std::collections::HashSet;

src/librustc_typeck/check/writeback.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// substitutions.
1414
use self::ResolveReason::*;
1515

16-
use astconv::AstConv;
1716
use check::FnCtxt;
1817
use middle::def_id::DefId;
1918
use middle::pat_util;

src/librustc_typeck/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ use middle::subst::{Substs, FnSpace, ParamSpace, SelfSpace, TypeSpace, VecPerPar
7878
use middle::ty::{ToPredicate, ImplContainer, ImplOrTraitItemContainer, TraitContainer};
7979
use middle::ty::{self, RegionEscape, ToPolyTraitRef, Ty, TypeScheme};
8080
use middle::ty::{VariantKind};
81-
use middle::ty::fold::{TypeFolder, TypeFoldable};
81+
use middle::ty::fold::TypeFoldable;
8282
use middle::ty::util::IntTypeExt;
8383
use middle::infer;
8484
use rscope::*;

src/librustdoc/clean/inline.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use std::collections::HashSet;
1414

1515
use syntax::ast;
16-
use syntax::attr::AttrMetaMethods;
1716
use rustc_front::hir;
1817

1918
use rustc::middle::cstore::{self, CrateStore};

src/libstd/sys/unix/fs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use io::prelude::*;
1211
use os::unix::prelude::*;
1312

1413
use ffi::{CString, CStr, OsString, OsStr};

src/libsyntax/diagnostic.rs

-2
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,6 @@ pub enum Level {
289289

290290
impl fmt::Display for Level {
291291
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
292-
use std::fmt::Display;
293-
294292
match *self {
295293
Bug => "error: internal compiler error".fmt(f),
296294
Fatal | Error => "error".fmt(f),

src/libsyntax/parse/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use ptr::P;
1919
use str::char_at;
2020

2121
use std::cell::RefCell;
22-
use std::io::Read;
2322
use std::iter;
2423
use std::path::{Path, PathBuf};
2524
use std::rc::Rc;

src/libsyntax/parse/parser.rs

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ use parse::PResult;
7878
use diagnostic::FatalError;
7979

8080
use std::collections::HashSet;
81-
use std::io::prelude::*;
8281
use std::mem;
8382
use std::path::{Path, PathBuf};
8483
use std::rc::Rc;

src/libsyntax/util/interner.rs

-2
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,12 @@ impl Ord for RcStr {
115115

116116
impl fmt::Debug for RcStr {
117117
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
118-
use std::fmt::Debug;
119118
self[..].fmt(f)
120119
}
121120
}
122121

123122
impl fmt::Display for RcStr {
124123
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
125-
use std::fmt::Display;
126124
self[..].fmt(f)
127125
}
128126
}

src/libtest/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ use self::TestEvent::*;
5858
use self::NamePadding::*;
5959
use self::OutputLocation::*;
6060

61-
use stats::Stats;
6261
use getopts::{OptGroup, optflag, optopt};
63-
use serialize::Encodable;
6462
use std::boxed::FnBox;
6563
use term::Terminal;
6664
use term::color::{Color, RED, YELLOW, GREEN, CYAN};

src/rustbook/main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ extern crate rustdoc;
1919
extern crate rustc_back;
2020

2121
use std::env;
22-
use std::error::Error;
2322
use std::process;
2423
use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering};
25-
use subcommand::Subcommand;
2624
use term::Term;
2725

2826
mod term;

0 commit comments

Comments
 (0)