Skip to content

Commit 5a7249c

Browse files
lhtbrson
authored andcommitted
Cleanup unused imports
1 parent 9bc2f18 commit 5a7249c

Some content is hidden

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

61 files changed

+104
-204
lines changed

src/comp/back/link.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,18 @@ import metadata::{encoder, cstore};
77
import middle::trans_common::crate_ctxt;
88
import std::str;
99
import std::fs;
10-
import std::os;
1110
import std::vec;
1211
import std::option;
1312
import std::run;
1413
import option::some;
1514
import option::none;
1615
import std::sha1::sha1;
17-
import std::sort;
1816
import syntax::ast;
1917
import syntax::print::pprust;
2018
import lib::llvm::llvm::ModuleRef;
21-
import lib::llvm::llvm::ValueRef;
2219
import lib::llvm::mk_pass_manager;
2320
import lib::llvm::mk_target_data;
24-
import lib::llvm::mk_type_names;
2521
import lib::llvm::False;
26-
import lib::llvm::True;
2722
import util::filesearch;
2823

2924
tag output_type {

src/comp/back/target_strs.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import std::str;
2-
31
type t = {
42
module_asm: str,
53
meta_sect_name: str,
64
data_layout: str,
75
target_triple: str,
86
gcc_args: [str]
9-
};
7+
};

src/comp/back/upcall.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11

2-
import std::str;
32
import driver::session;
43
import middle::trans;
5-
import trans::decl_cdecl_fn;
6-
import middle::trans_common::{T_f32, T_f64, T_fn, T_bool, T_i1, T_i8, T_i32,
7-
T_i64, T_int, T_vec, T_nil, T_opaque_chan_ptr,
8-
T_opaque_vec, T_opaque_port_ptr, T_ptr,
4+
import middle::trans_common::{T_fn, T_i1, T_i8, T_i32,
5+
T_i64, T_int, T_nil,
6+
T_opaque_vec, T_ptr,
97
T_size_t, T_void, T_float};
108
import lib::llvm::type_names;
119
import lib::llvm::llvm::ModuleRef;

src/comp/back/x86.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import lib::llvm::llvm;
2-
import lib::llvm::llvm::ModuleRef;
3-
import std::str;
41
import driver::session;
52

63
fn get_target_strs(target_os: session::os) -> target_strs::t {

src/comp/back/x86_64.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import lib::llvm::llvm;
2-
import lib::llvm::llvm::ModuleRef;
3-
import std::str;
41
import driver::session;
52

63
fn get_target_strs(target_os: session::os) -> target_strs::t {

src/comp/driver/rustc.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22

33
// -*- rust -*-
44
import metadata::{creader, cstore};
5-
import syntax::parse::{parser, token};
5+
import syntax::parse::{parser};
66
import syntax::{ast, codemap};
77
import front::attr;
88
import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage};
9-
import middle::tstate::ck;
109
import syntax::print::{pp, pprust};
11-
import util::{ppaux, common, filesearch};
10+
import util::{ppaux, filesearch};
1211
import back::link;
13-
import lib::llvm;
14-
import std::{fs, option, str, vec, int, io, run, getopts, result};
15-
import std::map::mk_hashmap;
12+
import std::{option, str, vec, int, io, getopts, result};
1613
import std::option::{some, none};
1714
import std::getopts::{optopt, optmulti, optflag, optflagopt, opt_present};
18-
import back::link::output_type;
1915
import back::{x86, x86_64};
2016

2117
tag pp_mode { ppm_normal; ppm_expanded; ppm_typed; ppm_identified; }

src/comp/driver/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import syntax::{ast, codemap};
33
import syntax::ast::node_id;
44
import codemap::span;
55
import syntax::ast::ty_mach;
6-
import std::{uint, map, option, str};
6+
import std::{option};
77
import std::option::{some, none};
88
import syntax::parse::parser::parse_sess;
99
import util::filesearch;

src/comp/front/attr.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Functions dealing with attributes and meta_items
22

3-
import std::{vec, str, map, option};
3+
import std::{vec, map, option};
44
import syntax::{ast, ast_util};
5-
import util::common;
65
import driver::session;
76

87
export attr_meta;

src/comp/front/test.rs

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

3-
import std::{option, vec, str};
3+
import std::{option, vec};
44
import syntax::{ast, ast_util};
55
import syntax::ast_util::*;
66
//import syntax::ast_util::dummy_sp;

src/comp/lib/llvm.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import std::{vec, str, option};
22
import std::str::sbuf;
33

4-
import llvm::{ModuleRef, ContextRef, TypeRef, TypeHandleRef, ValueRef,
5-
BasicBlockRef, BuilderRef, ModuleProviderRef, MemoryBufferRef,
6-
PassManagerRef, UseRef, TargetDataRef, Linkage, Attribute,
7-
Visibility, CallConv, IntPredicate, RealPredicate, Opcode,
4+
import llvm::{TypeRef, MemoryBufferRef,
5+
PassManagerRef, TargetDataRef,
86
ObjectFileRef, SectionIteratorRef};
97

108
type ULongLong = u64;

src/comp/metadata/creader.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import driver::session;
44
import syntax::{ast, ast_util};
55
import lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
66
import front::attr;
7-
import middle::resolve;
87
import syntax::visit;
98
import syntax::codemap::span;
10-
import back::x86;
11-
import util::{common, filesearch};
9+
import util::{filesearch};
1210
import std::{vec, str, fs, io, option};
1311
import std::option::{none, some};
1412
import std::map::{hashmap, new_int_hash};

src/comp/metadata/decoder.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// Decoding metadata from a single crate's metadata
22

33
import std::{ebml, vec, option, str, io};
4-
import std::map::hashmap;
54
import syntax::{ast, ast_util};
65
import front::attr;
76
import middle::ty;
87
import common::*;
98
import tydecode::{parse_def_id, parse_ty_data};
10-
import driver::session;
119
import syntax::print::pprust;
1210
import cstore;
1311

src/comp/metadata/encoder.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Metadata encoding
22

3-
import std::{vec, str, uint, io, option, ebml, map};
4-
import std::option::{some, none};
3+
import std::{vec, str, uint, io, ebml, map};
54
import syntax::ast::*;
65
import syntax::ast_util;
76
import syntax::ast_util::local_def;

src/comp/metadata/tydecode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Type decoding
22

3-
import std::{vec, str, uint, option};
3+
import std::{vec, str, uint};
44
import std::option::{none, some};
55
import syntax::ast;
66
import syntax::ast::*;

src/comp/metadata/tyencode.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Type encoding
22

3-
import std::{str, io, int, uint};
3+
import std::{io, int, uint};
44
import std::map::hashmap;
55
import std::option::{some, none};
66
import syntax::ast::*;
77
import middle::ty;
88
import syntax::print::pprust::*;
9-
import util::common;
109

1110
export ctxt;
1211
export ty_abbrev;

src/comp/middle/alias.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
import syntax::{ast, ast_util};
3-
import ast::{ident, fn_ident, node_id, def_id};
3+
import ast::{ident, fn_ident, node_id};
44
import syntax::codemap::span;
55
import syntax::visit;
66
import visit::vt;
7-
import std::{vec, str, option};
7+
import std::{vec, option};
88
import std::option::{some, none, is_none};
99

1010
// This is not an alias-analyser (though it would merit from becoming one, or

src/comp/middle/ast_map.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import std::{smallintmap, option};
22
import syntax::ast::*;
33
import syntax::ast_util;
44
import syntax::{visit, codemap};
5-
import visit::vt;
65

76
tag ast_node {
87
node_item(@item);

src/comp/middle/check_const.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import syntax::ast::*;
2-
import syntax::ast_util::{variant_def_ids, dummy_sp};
32
import syntax::visit;
43

54
fn check_crate(tcx: ty::ctxt, crate: @crate) {

src/comp/middle/fn_usage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import syntax::ast;
22
import syntax::visit;
33
import std::option::some;
4-
import syntax::print::pprust::{expr_to_str, path_to_str};
4+
import syntax::print::pprust::expr_to_str;
55

66
export check_crate_fn_usage;
77

src/comp/middle/freevars.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// A pass that annotates for each loops and functions with the free
22
// variables that they contain.
33

4-
import std::{map, option, int, str};
4+
import std::{int};
55
import std::map::*;
66
import std::option::*;
77
import syntax::{ast, ast_util, visit};
8-
import driver::session;
98
import middle::resolve;
109
import syntax::codemap::span;
1110

src/comp/middle/gc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Routines useful for garbage collection.
22

3-
import lib::llvm::{True, False};
3+
import lib::llvm::True;
44
import lib::llvm::llvm::ValueRef;
55
import middle::trans;
66
import middle::trans::{get_tydesc, tps_normal};
77
import middle::trans_common::*;
88
import middle::ty;
9-
import std::option::{some, none};
10-
import std::{ptr, str, unsafe, vec};
9+
import std::option::none;
10+
import std::str;
1111

1212
import lll = lib::llvm::llvm;
1313
import bld = trans_build;

src/comp/middle/kind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
*/
8686

8787
import syntax::{ast, ast_util, visit, codemap};
88-
import std::{vec, option, str};
88+
import std::{vec, option};
8989
import ast::{kind, kind_unique, kind_shared, kind_pinned};
9090

9191
fn kind_lteq(a: kind, b: kind) -> bool {

src/comp/middle/resolve.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
import syntax::{ast, ast_util, codemap};
33
import syntax::ast::*;
44
import ast::{ident, fn_ident, def, def_id, node_id};
5-
import syntax::ast_util::{local_def, respan};
5+
import syntax::ast_util::local_def;
66

77
import metadata::{csearch, cstore};
88
import driver::session::session;
99
import util::common::*;
1010
import std::map::{new_int_hash, new_str_hash};
1111
import syntax::codemap::span;
12-
import middle::ty::constr_table;
1312
import syntax::visit;
1413
import visit::vt;
15-
import std::{vec, int, list, option, str};
14+
import std::{vec, list, option, str};
1615
import std::map::hashmap;
1716
import std::list::{list, nil, cons};
1817
import std::option::{some, none, is_none};

src/comp/middle/shape.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
import lib::llvm::True;
55
import lib::llvm::llvm::{ModuleRef, TypeRef, ValueRef};
66
import middle::{trans, trans_common};
7-
import middle::trans::llsize_of;
8-
import middle::trans_common::{crate_ctxt, val_ty, C_bytes, C_int,
9-
C_named_struct, C_struct, C_uint, T_i8, T_ptr};
7+
import middle::trans_common::{crate_ctxt, val_ty, C_bytes,
8+
C_named_struct, C_struct};
109
import middle::ty;
11-
import middle::ty::{field, mt};
10+
import middle::ty::field;
1211
import syntax::ast;
1312
import syntax::ast_util::dummy_sp;
14-
import syntax::codemap::span;
1513
import syntax::util::interner;
1614
import util::common;
1715

src/comp/middle/trans.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,29 @@
1212
// pcwalton). You can, instead, find out its TypeRef by calling val_ty,
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.
15-
import std::{int, str, uint, map, option, fs, time, vec};
15+
import std::{str, uint, map, option, time, vec};
1616
import std::map::hashmap;
1717
import std::map::{new_int_hash, new_str_hash};
1818
import std::option::{some, none};
1919
import driver::session;
2020
import middle::{ty, gc};
2121
import middle::freevars::*;
22-
import back::{link, x86, abi, upcall};
22+
import back::{link, abi, upcall};
2323
import syntax::{ast, ast_util};
2424
import syntax::visit;
2525
import syntax::codemap::span;
26-
import syntax::print::pprust::{expr_to_str, path_to_str};
26+
import syntax::print::pprust::{expr_to_str};
2727
import visit::vt;
28-
import util::common;
2928
import util::common::*;
30-
import lib::llvm::{llvm, target_data, type_names,
31-
mk_target_data, mk_type_names};
32-
import lib::llvm::llvm::{ModuleRef, ValueRef, TypeRef, TypeHandleRef,
33-
BuilderRef, BasicBlockRef};
34-
import lib::llvm::{Bool, True, False};
29+
import lib::llvm::{llvm, mk_target_data, mk_type_names};
30+
import lib::llvm::llvm::{ModuleRef, ValueRef, TypeRef, BasicBlockRef};
31+
import lib::llvm::{True, False};
3532
import link::{mangle_internal_name_by_type_only,
3633
mangle_internal_name_by_seq,
3734
mangle_internal_name_by_path,
3835
mangle_internal_name_by_path_and_seq,
3936
mangle_exported_name};
40-
import metadata::{creader, csearch, cstore};
37+
import metadata::{csearch, cstore};
4138
import util::ppaux::{ty_to_str, ty_to_short_str};
4239

4340
import trans_common::*;

src/comp/middle/trans_alt.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import std::{str, vec, option, int};
1+
import std::{str, vec, option};
22
import option::{some, none};
3-
import std::map::hashmap;
43

54
import lib::llvm::llvm;
6-
import lib::llvm::llvm::{ValueRef, TypeRef, BasicBlockRef};
5+
import lib::llvm::llvm::{ValueRef, BasicBlockRef};
76
import trans_build::*;
87
import trans::{new_sub_block_ctxt, new_scope_block_ctxt, load_if_immediate};
9-
import ty::pat_ty;
108
import syntax::ast;
119
import syntax::ast_util;
1210
import syntax::ast_util::dummy_sp;

src/comp/middle/trans_build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import std::str::sbuf;
33
import lib::llvm::llvm;
44
import llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, Opcode,
55
ModuleRef};
6-
import trans_common::{block_ctxt, T_ptr, T_nil, T_int, T_i8, T_i1,
7-
val_ty, val_str, bcx_ccx, C_i32};
6+
import trans_common::{block_ctxt, T_ptr, T_nil, T_i8, T_i1,
7+
val_ty, C_i32};
88

99
fn B(cx: @block_ctxt) -> BuilderRef {
1010
let b = *cx.fcx.lcx.ccx.builder;

0 commit comments

Comments
 (0)