Skip to content

Commit 52a7417

Browse files
committed
Remove some pointless imports
1 parent 50fb4c3 commit 52a7417

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+12
-134
lines changed

src/comp/back/link.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
import core::ctypes::{c_int, c_uint};
1+
import ctypes::{c_int, c_uint};
22
import driver::session;
33
import session::session;
44
import lib::llvm::llvm;
55
import front::attr;
66
import middle::ty;
77
import metadata::{encoder, cstore};
88
import middle::trans::common::crate_ctxt;
9-
import str;
109
import std::fs;
11-
import vec;
12-
import option;
1310
import std::run;
14-
import option::some;
15-
import option::none;
1611
import std::sha1::sha1;
1712
import syntax::ast;
1813
import syntax::print::pprust;

src/comp/back/rpath.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import std::os;
2-
import std::fs;
3-
import std::os_fs;
4-
import vec;
5-
import std::map;
6-
import str;
7-
import uint;
1+
import std::{os, fs, os_fs, map};
82
import metadata::cstore;
93
import driver::session;
104
import util::filesearch;

src/comp/driver/driver.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage,
1010
import syntax::print::{pp, pprust};
1111
import util::{ppaux, filesearch};
1212
import back::link;
13-
import core::{option, str, int, result};
1413
import result::{ok, err};
1514
import std::{fs, io, getopts};
1615
import io::{reader_util, writer_util};
17-
import option::{some, none};
1816
import getopts::{optopt, optmulti, optflag, optflagopt, opt_present};
1917
import back::{x86, x86_64};
2018

src/comp/driver/rustc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ use std;
22
use rustc;
33

44
// -*- rust -*-
5-
import core::{option, str, vec, result};
65
import result::{ok, err};
76
import std::{io, getopts};
87
import io::writer_util;
9-
import option::{some, none};
108
import getopts::{opt_present};
119
import rustc::driver::driver::*;
1210
import rustc::syntax::codemap;

src/comp/driver/session.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import syntax::{ast, codemap};
33
import syntax::ast::node_id;
44
import codemap::span;
55
import syntax::ast::{int_ty, uint_ty, float_ty};
6-
import option;
7-
import option::{some, none};
86
import syntax::parse::parser::parse_sess;
97
import util::filesearch;
108
import back::target_strs;

src/comp/front/attr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Functions dealing with attributes and meta_items
22

3-
import core::{either, vec, option};
43
import std::map;
54
import syntax::{ast, ast_util};
65
import driver::session::session;

src/comp/front/config.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import core::{vec, option};
21
import syntax::{ast, fold};
3-
import attr;
42

53
export strip_unconfigured_items;
64
export metas_in_cfg;

src/comp/front/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Code that generates a test runner to run all the tests in a crate
22

3-
import core::{option, vec};
43
import syntax::{ast, ast_util};
54
import syntax::ast_util::*;
65
//import syntax::ast_util::dummy_sp;

src/comp/lib/llvm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import core::{vec, str, option};
21
import str::sbuf;
32

43
import ctypes::{c_int, c_uint, unsigned, longlong, ulonglong};

src/comp/metadata/common.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// EBML enum definitions and utils shared by the encoder and decoder
22

3-
import str;
4-
53
const tag_paths: uint = 0x01u;
64

75
const tag_items: uint = 0x02u;

src/comp/metadata/creader.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import syntax::codemap::span;
1010
import util::{filesearch};
1111
import std::{io, fs};
1212
import io::writer_util;
13-
import option::{none, some};
1413
import std::map::{hashmap, new_int_hash};
1514
import syntax::print::pprust;
1615
import common::*;

src/comp/metadata/csearch.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import syntax::ast;
44
import syntax::ast_util;
55
import middle::ty;
6-
import option::{some, none};
76
import driver::session;
87

98
export get_symbol;

src/comp/metadata/cstore.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// The crate store - a central repo for information collected about external
22
// crates and libraries
33

4-
import core::{vec, str};
54
import std::map;
65
import syntax::ast;
76
import util::common::*;

src/comp/metadata/tydecode.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Type decoding
22

3-
import core::{vec, str, uint};
4-
import option::{none, some};
53
import syntax::ast;
64
import syntax::ast::*;
75
import syntax::ast_util;

src/comp/metadata/tyencode.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import std::io;
44
import io::writer_util;
55
import std::map::hashmap;
6-
import option::{some, none};
76
import syntax::ast::*;
87
import driver::session::session;
98
import middle::ty;

src/comp/middle/alias.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import ast::{ident, fn_ident, node_id};
44
import syntax::codemap::span;
55
import syntax::visit;
66
import visit::vt;
7-
import core::{vec, option};
87
import std::list;
98
import std::util::unreachable;
10-
import option::{some, none, is_none};
9+
import option::is_none;
1110
import list::list;
1211
import driver::session::session;
1312
import pat_util::*;

src/comp/middle/ast_map.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import option;
21
import std::map;
32
import syntax::ast::*;
43
import syntax::ast_util;

src/comp/middle/check_alt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import syntax::ast_util::{variant_def_ids, dummy_sp, compare_lit_exprs,
55
import syntax::codemap::span;
66
import pat_util::*;
77
import syntax::visit;
8-
import option::{some, none};
98
import driver::session::session;
109
import middle::ty;
1110
import middle::ty::*;

src/comp/middle/debuginfo.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import core::{vec, str, option, sys, ctypes, unsafe};
21
import std::fs;
32
import std::map::hashmap;
43
import lib::llvm::llvm;

src/comp/middle/fn_usage.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import syntax::ast;
22
import syntax::visit;
3-
import option::some;
43
import syntax::print::pprust::expr_to_str;
54
import driver::session::session;
65

src/comp/middle/freevars.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// variables that they contain.
33

44
import syntax::print::pprust::path_to_str;
5-
import int;
65
import std::map::*;
76
import option::*;
87
import syntax::{ast, ast_util, visit};

src/comp/middle/kind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import option::{some, none};
21
import syntax::{visit, ast_util};
32
import syntax::ast::*;
43
import syntax::codemap::span;

src/comp/middle/last_use.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import syntax::ast::*;
33
import syntax::codemap::span;
44
import std::list::{is_not_empty, list, nil, cons, tail};
55
import std::util::unreachable;
6-
import core::{vec, option};
76
import std::list;
87

98
// Last use analysis pass.

src/comp/middle/mut.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import core::{vec, str, option};
2-
import option::{some, none};
31
import syntax::ast::*;
42
import syntax::visit;
53
import syntax::ast_util;

src/comp/middle/resolve.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import std::map::{new_int_hash, new_str_hash};
1313
import syntax::codemap::span;
1414
import syntax::visit;
1515
import visit::vt;
16-
import core::{vec, option, str};
1716
import std::list;
1817
import std::map::hashmap;
1918
import std::list::{list, nil, cons};
20-
import option::{some, none, is_none, is_some};
19+
import option::{is_none, is_some};
2120
import syntax::print::pprust::*;
2221

2322
export resolve_crate;

src/comp/middle/shape.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ import util::common;
2121
import trans::build::{Load, Store, Add, GEPi};
2222
import syntax::codemap::span;
2323

24-
import core::{vec, str};
2524
import std::map::hashmap;
26-
import option::{none, some};
2725

2826
import ty_ctxt = middle::ty::ctxt;
2927

src/comp/middle/trans/alt.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import core::{str, vec, option};
2-
import option::{some, none};
3-
41
import driver::session::session;
52
import lib::llvm::llvm;
63
import lib::llvm::{ValueRef, BasicBlockRef};

src/comp/middle/trans/base.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
// but many TypeRefs correspond to one ty::t; for instance, tup(int, int,
1414
// int) and rec(x=int, y=int, z=int) will have the same TypeRef.
1515

16-
import core::ctypes::c_uint;
16+
import ctypes::c_uint;
1717
import std::{map, time};
1818
import std::map::hashmap;
1919
import std::map::{new_int_hash, new_str_hash};
20-
import option::{some, none};
2120
import driver::session;
2221
import session::session;
2322
import front::attr;

src/comp/middle/trans/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import core::{vec, str};
2-
import core::ctypes::{c_uint, c_int};
1+
import ctypes::{c_uint, c_int};
32
import str::sbuf;
43
import lib::llvm::llvm;
54
import syntax::codemap;

src/comp/middle/trans/closure.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import common::*;
77
import build::*;
88
import base::*;
99
import middle::freevars::{get_freevars, freevar_info};
10-
import option::{some, none};
1110
import back::abi;
1211
import syntax::codemap::span;
1312
import syntax::print::pprust::expr_to_str;

src/comp/middle/trans/common.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
44
*/
55

6-
import core::{int, vec, str, uint, option, unsafe};
7-
import core::ctypes::unsigned;
6+
import ctypes::unsigned;
87
import vec::to_ptr;
98
import std::map::hashmap;
10-
import option::some;
119
import syntax::ast;
1210
import driver::session;
1311
import session::session;

src/comp/middle/trans/impl.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import core::ctypes::c_uint;
1+
import ctypes::c_uint;
22
import base::*;
33
import common::*;
44
import build::*;
55
import driver::session::session;
6-
import option::{some, none};
76
import syntax::{ast, ast_util};
87
import metadata::csearch;
98
import back::{link, abi};

src/comp/middle/trans/tvec.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import vec;
2-
import option::none;
31
import syntax::ast;
42
import driver::session::session;
53
import lib::llvm::{ValueRef, TypeRef};

src/comp/middle/tstate/annotate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
import core::{int, uint};
32
import syntax::ast::*;
43
import syntax::visit;
54
import syntax::codemap::span;

src/comp/middle/tstate/auxiliary.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import core::{vec, int, uint, option};
21
import option::*;
32
import pat_util::*;
43
import syntax::ast::*;

src/comp/middle/tstate/bitvectors.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import syntax::ast::*;
22
import syntax::visit;
3-
import vec;
43
import option::*;
54
import aux::*;
65
import tstate::ann::{pre_and_post, precond, postcond, prestate, poststate,

src/comp/middle/tstate/ck.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import syntax::codemap::span;
66
import middle::ty;
77
import tstate::ann::{precond, prestate,
88
implies, ann_precond, ann_prestate};
9-
import option;
109
import aux::*;
1110
import syntax::print::pprust::ty_to_str;
1211
import bitvectors::*;

src/comp/middle/tstate/pre_post_conditions.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
import core::{vec, option};
3-
import option::{none, some};
4-
51
import tstate::ann::*;
62
import aux::*;
73
import bitvectors::{bit_num, seq_preconds, seq_postconds,

src/comp/middle/tstate/states.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import core::{vec, option};
2-
import option::{none, some};
31
import ann::*;
42
import aux::*;
53
import tritv::{tritv_clone, tritv_set, ttrue};

src/comp/middle/ty.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
import vec;
2-
import str;
3-
import uint;
4-
import std::ufind;
5-
import std::map;
1+
import std::{ufind, map, smallintmap};
62
import std::map::hashmap;
7-
import option;
8-
import option::none;
9-
import option::some;
10-
import std::smallintmap;
113
import driver::session;
124
import session::session;
135
import syntax::ast;

src/comp/middle/typeck.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ import middle::ty::{node_id_to_type, arg, block_ty,
1313
ty_param_bounds_and_ty};
1414
import util::ppaux::ty_to_str;
1515
import middle::ty::unify::{ures_ok, ures_err, fix_ok, fix_err};
16-
import core::{int, vec, str, option};
1716
import std::smallintmap;
1817
import std::map::{hashmap, new_int_hash};
19-
import option::{none, some};
2018
import syntax::print::pprust::*;
2119

2220
export check_crate;

src/comp/syntax/ast.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// The Rust abstract syntax tree.
22

3-
import option;
43
import codemap::{span, filename};
54

65
type spanned<T> = {node: T, span: span};

src/comp/syntax/codemap.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import core::{vec, uint, str, option, result};
2-
import option::{some, none};
3-
41
type filename = str;
52

63
type file_pos = {ch: uint, byte: uint};

src/comp/syntax/ext/base.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import core::{vec, option};
21
import std::map::hashmap;
32
import driver::session::session;
43
import codemap::{span, expn_info, expanded_from};
54
import std::map::new_str_hash;
6-
import codemap;
75

86
type syntax_expander_ =
97
fn@(ext_ctxt, span, ast::mac_arg, ast::mac_body) -> @ast::expr;

src/comp/syntax/ext/build.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import core::{vec, str, option};
2-
import option::{some};
31
import codemap::span;
42
import syntax::ext::base::ext_ctxt;
53

src/comp/syntax/ext/concat_idents.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import option;
21
import base::*;
32
import syntax::ast;
43

src/comp/syntax/ext/env.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* should all get sucked into either the compiler syntax extension plugin
55
* interface.
66
*/
7-
import core::{vec, option};
87
import std::generic_os;
98
import base::*;
109
export expand_syntax_ext;

0 commit comments

Comments
 (0)