Skip to content

Commit 7ad1900

Browse files
committed
Remove unused trait imports flagged by lint
1 parent 7d8100a commit 7ad1900

File tree

39 files changed

+13
-50
lines changed

39 files changed

+13
-50
lines changed

src/libcoretest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(box_syntax)]
1616
#![feature(cell_extras)]
1717
#![feature(const_fn)]
18-
#![feature(core_float)]
1918
#![feature(core_private_bignum)]
2019
#![feature(core_private_diy_float)]
2120
#![feature(dec2flt)]

src/libcoretest/num/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ pub fn test_num<T>(ten: T, two: T) where
5252
mod tests {
5353
use core::option::Option;
5454
use core::option::Option::{Some, None};
55-
use core::num::Float;
5655

5756
#[test]
5857
fn from_str_issue7588() {

src/librustc_const_eval/eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use self::EvalHint::*;
1717

1818
use rustc::hir::map as ast_map;
1919
use rustc::hir::map::blocks::FnLikeNode;
20-
use rustc::middle::cstore::{self, CrateStore, InlinedItem};
20+
use rustc::middle::cstore::{self, InlinedItem};
2121
use rustc::{infer, traits};
2222
use rustc::hir::def::Def;
2323
use rustc::hir::def_id::DefId;

src/librustc_driver/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ use rustc_trans::back::link;
7070
use rustc::session::{self, config, Session, build_session, CompileResult};
7171
use rustc::session::config::{Input, PrintRequest, OutputType, ErrorOutputType};
7272
use rustc::session::config::{get_unstable_features_setting, nightly_options};
73-
use rustc::middle::cstore::CrateStore;
7473
use rustc::lint::Lint;
7574
use rustc::lint;
7675
use rustc_metadata::loader;

src/librustc_incremental/persist/data.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//! The data that we will serialize and deserialize.
1212
1313
use rustc::dep_graph::DepNode;
14-
use rustc_serialize::{Decoder as RustcDecoder, Encoder as RustcEncoder};
1514

1615
use super::directory::DefPathIndex;
1716

src/librustc_incremental/persist/directory.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use rustc::hir::map::DefPath;
1818
use rustc::hir::def_id::DefId;
1919
use rustc::ty;
2020
use rustc::util::nodemap::DefIdMap;
21-
use rustc_serialize::{Decoder as RustcDecoder, Encoder as RustcEncoder};
2221
use std::fmt::{self, Debug};
2322

2423
/// Index into the DefIdDirectory

src/librustc_lint/builtin.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
//! a `pub fn new()`.
3030
3131
use rustc::hir::def::Def;
32-
use middle::cstore::CrateStore;
3332
use rustc::hir::def_id::DefId;
3433
use middle::stability;
3534
use rustc::{cfg, infer};

src/librustc_lint/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::{i8, i16, i32, i64, u8, u16, u32, u64, f32, f64};
2626

2727
use syntax::ast;
2828
use syntax::abi::Abi;
29-
use syntax::attr::{self, AttrMetaMethods};
29+
use syntax::attr;
3030
use syntax::codemap::{self, Span};
3131

3232
use rustc::hir;

src/librustc_metadata/csearch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ impl<'tcx> CrateStore<'tcx> for cstore::CStore {
536536
let mut visible_parent_map = self.visible_parent_map.borrow_mut();
537537
if !visible_parent_map.is_empty() { return visible_parent_map; }
538538

539-
use rustc::middle::cstore::{CrateStore, ChildItem};
539+
use rustc::middle::cstore::ChildItem;
540540
use std::collections::vec_deque::VecDeque;
541541
use std::collections::hash_map::Entry;
542542
for cnum in 1 .. self.next_crate_num() {

src/librustc_metadata/decoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use rustc::mir;
4343
use rustc::mir::visit::MutVisitor;
4444

4545
use std::cell::Cell;
46-
use std::io::prelude::*;
4746
use std::io;
4847
use std::rc::Rc;
4948
use std::str;

src/librustc_metadata/encoder.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use def_key;
2121
use tyencode;
2222
use index::{self, IndexData};
2323

24-
use middle::cstore::{LOCAL_CRATE, CrateStore, InlinedItemRef, LinkMeta, tls};
24+
use middle::cstore::{LOCAL_CRATE, InlinedItemRef, LinkMeta, tls};
2525
use rustc::hir::def;
2626
use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
2727
use middle::dependency_format::Linkage;
@@ -46,7 +46,6 @@ use syntax::abi::Abi;
4646
use syntax::ast::{self, NodeId, Name, CRATE_NODE_ID, CrateNum};
4747
use syntax::codemap::BytePos;
4848
use syntax::attr;
49-
use syntax::attr::AttrMetaMethods;
5049
use syntax::errors::Handler;
5150
use syntax;
5251
use rbml::writer::Encoder;

src/librustc_metadata/loader.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ use std::cmp;
233233
use std::collections::HashMap;
234234
use std::fmt;
235235
use std::fs;
236-
use std::io::prelude::*;
237236
use std::io;
238237
use std::path::{Path, PathBuf};
239238
use std::ptr;

src/librustc_privacy/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use rustc::hir::intravisit::{self, Visitor};
3434

3535
use rustc::dep_graph::DepNode;
3636
use rustc::lint;
37-
use rustc::middle::cstore::CrateStore;
3837
use rustc::hir::def::{self, Def};
3938
use rustc::hir::def_id::DefId;
4039
use rustc::middle::privacy::{AccessLevel, AccessLevels};

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use ParentLink::{ModuleParentLink, BlockParentLink};
2121
use Resolver;
2222
use {resolve_error, resolve_struct_error, ResolutionError};
2323

24-
use rustc::middle::cstore::{CrateStore, ChildItem, DlDef};
24+
use rustc::middle::cstore::{ChildItem, DlDef};
2525
use rustc::lint;
2626
use rustc::hir::def::*;
2727
use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};

src/librustc_resolve/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ use rustc::dep_graph::DepNode;
4747
use rustc::hir::map as hir_map;
4848
use rustc::session::Session;
4949
use rustc::lint;
50-
use rustc::middle::cstore::CrateStore;
5150
use rustc::hir::def::*;
5251
use rustc::hir::def_id::DefId;
5352
use rustc::hir::pat_util::pat_bindings;
@@ -58,7 +57,6 @@ use rustc::util::nodemap::{NodeMap, FnvHashMap, FnvHashSet};
5857

5958
use syntax::ast::{self, FloatTy};
6059
use syntax::ast::{CRATE_NODE_ID, Name, NodeId, CrateNum, IntTy, UintTy};
61-
use syntax::attr::AttrMetaMethods;
6260
use syntax::codemap::{self, Span, Pos};
6361
use syntax::errors::DiagnosticBuilder;
6462
use syntax::parse::token::{self, keywords};

src/librustc_resolve/resolve_imports.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use rustc::lint;
2525
use rustc::hir::def::*;
2626

2727
use syntax::ast::{NodeId, Name};
28-
use syntax::attr::AttrMetaMethods;
2928
use syntax::codemap::{Span, DUMMY_SP};
3029
use syntax::util::lev_distance::find_best_match_for_name;
3130

src/librustc_save_analysis/data.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
//! The `Dump` trait can be used together with `DumpVisitor` in order to
1414
//! retrieve the data from a crate.
1515
16-
use std::hash::Hasher;
17-
1816
use rustc::hir::def_id::DefId;
1917
use rustc::ty;
2018
use syntax::ast::{CrateNum, NodeId};

src/librustc_trans/back/archive.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ use std::process::{Command, Output, Stdio};
2121
use std::ptr;
2222
use std::str;
2323

24-
use middle::cstore::CrateStore;
25-
2624
use libc;
2725
use llvm::archive_ro::{ArchiveRO, Child};
2826
use llvm::{self, ArchiveKind};

src/librustc_trans/back/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use session::config::{OutputFilenames, Input, OutputType};
1919
use session::filesearch;
2020
use session::search_paths::PathKind;
2121
use session::Session;
22-
use middle::cstore::{self, CrateStore, LinkMeta};
22+
use middle::cstore::{self, LinkMeta};
2323
use middle::cstore::{LinkagePreference, NativeLibraryKind};
2424
use middle::dependency_format::Linkage;
2525
use CrateTranslation;

src/librustc_trans/back/linker.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::path::{Path, PathBuf};
1616
use std::process::Command;
1717

1818
use back::archive;
19-
use middle::cstore::CrateStore;
2019
use middle::dependency_format::Linkage;
2120
use session::Session;
2221
use session::config::CrateTypeDylib;

src/librustc_trans/base.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use lint;
3535
use llvm::{BasicBlockRef, Linkage, ValueRef, Vector, get_param};
3636
use llvm;
3737
use rustc::cfg;
38-
use middle::cstore::CrateStore;
3938
use rustc::hir::def_id::DefId;
4039
use rustc::infer;
4140
use middle::lang_items::{LangItem, ExchangeMallocFnLangItem, StartFnLangItem};

src/librustc_trans/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use type_::Type;
3939
use value::Value;
4040
use rustc::ty::{self, Ty, TyCtxt};
4141
use rustc::traits::{self, SelectionContext, ProjectionMode};
42-
use rustc::ty::fold::{TypeFolder, TypeFoldable};
42+
use rustc::ty::fold::TypeFoldable;
4343
use rustc::hir;
4444
use util::nodemap::NodeMap;
4545

src/librustc_trans/inline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use llvm::{AvailableExternallyLinkage, InternalLinkage, SetLinkage};
12-
use middle::cstore::{CrateStore, FoundAst, InlinedItem};
12+
use middle::cstore::{FoundAst, InlinedItem};
1313
use rustc::hir::def_id::DefId;
1414
use rustc::ty::subst::Substs;
1515
use base::{push_ctxt, trans_item, trans_fn};

src/librustc_typeck/check/coercion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ use rustc::ty::adjustment::{AdjustUnsafeFnPointer, AdjustMutToConstPointer};
7171
use rustc::ty::{self, LvaluePreference, TypeAndMut, Ty, TyCtxt};
7272
use rustc::ty::fold::TypeFoldable;
7373
use rustc::ty::error::TypeError;
74-
use rustc::ty::relate::{RelateResult, TypeRelation};
74+
use rustc::ty::relate::RelateResult;
7575
use util::common::indent;
7676

7777
use std::cell::RefCell;

src/librustc_typeck/check/intrinsic.rs

Lines changed: 0 additions & 3 deletions
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 rustc::ty::subst::{self, Substs};
1716
use rustc::ty::FnSig;
1817
use rustc::ty::{self, Ty, TyCtxt};
19-
use rustc::ty::fold::TypeFolder;
2018
use {CrateCtxt, require_same_types};
2119

2220
use std::collections::{HashMap};
2321
use syntax::abi::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

Lines changed: 0 additions & 1 deletion
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 hir::def::Def;
1615
use hir::def_id::DefId;

src/librustc_typeck/check/method/suggest.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
1414
use CrateCtxt;
1515

16-
use astconv::AstConv;
1716
use check::{self, FnCtxt, UnresolvedTypeAction, autoderef};
1817
use rustc::hir::map as hir_map;
1918
use rustc::ty::{self, Ty, ToPolyTraitRef, ToPredicate, TypeFoldable};
20-
use middle::cstore::{self, CrateStore};
19+
use middle::cstore;
2120
use hir::def::Def;
2221
use hir::def_id::DefId;
2322
use middle::lang_items::FnOnceTraitLangItem;

src/librustc_typeck/check/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ use rustc::ty::{self, ToPolyTraitRef, Ty, TyCtxt, Visibility};
9999
use rustc::ty::{MethodCall, MethodCallee};
100100
use rustc::ty::adjustment;
101101
use rustc::ty::error::TypeError;
102-
use rustc::ty::fold::{TypeFolder, TypeFoldable};
103-
use rustc::ty::relate::TypeRelation;
102+
use rustc::ty::fold::TypeFoldable;
104103
use rustc::ty::util::{Representability, IntTypeExt};
105104
use require_c_abi_if_variadic;
106105
use rscope::{ElisionFailureInfo, RegionScope};

src/librustc_typeck/check/regionck.rs

Lines changed: 0 additions & 1 deletion
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/wfcheck.rs

Lines changed: 0 additions & 2 deletions
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};
1312
use constrained_type_params::{identify_constrained_type_params, Parameter};
1413
use CrateCtxt;
@@ -17,7 +16,6 @@ use middle::region::{CodeExtent};
1716
use rustc::ty::subst::{self, TypeSpace, FnSpace, ParamSpace, SelfSpace};
1817
use rustc::traits;
1918
use rustc::ty::{self, Ty, TyCtxt};
20-
use rustc::ty::fold::{TypeFolder};
2119

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

src/librustc_typeck/check/writeback.rs

Lines changed: 0 additions & 1 deletion
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 hir::def_id::DefId;
1918
use hir::pat_util;

src/librustc_typeck/coherence/overlap.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
//! same type. Likewise, no two inherent impls for a given type
1313
//! constructor provide a method with the same name.
1414
15-
use middle::cstore::CrateStore;
1615
use hir::def_id::DefId;
1716
use rustc::traits::{self, ProjectionMode};
1817
use rustc::infer;

src/librustc_typeck/collect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ use rustc::ty::subst::{Substs, FnSpace, ParamSpace, SelfSpace, TypeSpace, VecPer
7373
use rustc::ty::{ToPredicate, ImplContainer, ImplOrTraitItemContainer, TraitContainer};
7474
use rustc::ty::{self, ToPolyTraitRef, Ty, TyCtxt, TypeScheme};
7575
use rustc::ty::{VariantKind};
76-
use rustc::ty::fold::{TypeFolder};
7776
use rustc::ty::util::IntTypeExt;
7877
use rscope::*;
7978
use rustc::dep_graph::DepNode;

src/librustdoc/clean/inline.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ use std::collections::HashSet;
1414
use std::iter::once;
1515

1616
use syntax::ast;
17-
use syntax::attr::AttrMetaMethods;
1817
use rustc::hir;
1918

20-
use rustc::middle::cstore::{self, CrateStore};
19+
use rustc::middle::cstore;
2120
use rustc::hir::def::Def;
2221
use rustc::hir::def_id::DefId;
2322
use rustc::ty::{self, TyCtxt};

src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use syntax::parse::token::{self, InternedString, keywords};
3535
use syntax::ptr::P;
3636

3737
use rustc_trans::back::link;
38-
use rustc::middle::cstore::{self, CrateStore};
38+
use rustc::middle::cstore;
3939
use rustc::middle::privacy::AccessLevels;
4040
use rustc::hir::def::Def;
4141
use rustc::hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX};

src/librustdoc/html/layout.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use std::fmt;
12-
use std::io::prelude::*;
1312
use std::io;
1413

1514
use externalfiles::ExternalHtml;

src/libstd/collections/hash/bench.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![cfg(test)]
1212

1313
extern crate test;
14-
use prelude::v1::*;
1514

1615
use self::test::Bencher;
1716

src/libstd/io/error.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ mod test {
350350
use prelude::v1::*;
351351
use super::{Error, ErrorKind};
352352
use error;
353-
use error::Error as error_Error;
354353
use fmt;
355354
use sys::os::error_string;
356355

src/tools/rustbook/main.rs

Lines changed: 0 additions & 2 deletions
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)