Skip to content

Commit a26837c

Browse files
pcwaltonpcwalton
committed
rustc: "import" -> "use"
1 parent 8ff18ac commit a26837c

Some content is hidden

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

92 files changed

+901
-901
lines changed

‎src/rustc/back/link.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import libc::{c_int, c_uint, c_char};
2-
import driver::session;
3-
import session::session;
4-
import lib::llvm::llvm;
5-
import syntax::attr;
6-
import middle::ty;
7-
import metadata::{encoder, cstore};
8-
import middle::trans::common::crate_ctxt;
9-
import metadata::common::link_meta;
10-
import std::map::hashmap;
11-
import std::sha1::sha1;
12-
import syntax::ast;
13-
import syntax::print::pprust;
14-
import lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data, True, False,
1+
use libc::{c_int, c_uint, c_char};
2+
use driver::session;
3+
use session::session;
4+
use lib::llvm::llvm;
5+
use syntax::attr;
6+
use middle::ty;
7+
use metadata::{encoder, cstore};
8+
use middle::trans::common::crate_ctxt;
9+
use metadata::common::link_meta;
10+
use std::map::hashmap;
11+
use std::sha1::sha1;
12+
use syntax::ast;
13+
use syntax::print::pprust;
14+
use lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data, True, False,
1515
PassManagerRef, FileType};
16-
import metadata::filesearch;
17-
import syntax::ast_map::{path, path_mod, path_name};
18-
import io::{Writer, WriterUtil};
16+
use metadata::filesearch;
17+
use syntax::ast_map::{path, path_mod, path_name};
18+
use io::{Writer, WriterUtil};
1919

2020
enum output_type {
2121
output_type_none,

‎src/rustc/back/rpath.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import std::map;
2-
import std::map::hashmap;
3-
import metadata::cstore;
4-
import driver::session;
5-
import metadata::filesearch;
1+
use std::map;
2+
use std::map::hashmap;
3+
use metadata::cstore;
4+
use driver::session;
5+
use metadata::filesearch;
66

77
export get_rpath_flags;
88

‎src/rustc/back/upcall.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
import driver::session;
3-
import middle::trans::base;
4-
import middle::trans::common::{T_fn, T_i1, T_i8, T_i32,
2+
use driver::session;
3+
use middle::trans::base;
4+
use middle::trans::common::{T_fn, T_i1, T_i8, T_i32,
55
T_int, T_nil,
66
T_opaque_vec, T_ptr, T_unique_ptr,
77
T_size_t, T_void, T_vec2};
8-
import lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef};
8+
use lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef};
99

1010
type upcalls =
1111
{_fail: ValueRef,

‎src/rustc/back/x86.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import driver::session;
2-
import session::sess_os_to_meta_os;
3-
import metadata::loader::meta_section_name;
1+
use driver::session;
2+
use session::sess_os_to_meta_os;
3+
use metadata::loader::meta_section_name;
44

55
fn get_target_strs(target_os: session::os) -> target_strs::t {
66
return {

‎src/rustc/back/x86_64.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import driver::session;
2-
import session::sess_os_to_meta_os;
3-
import metadata::loader::meta_section_name;
1+
use driver::session;
2+
use session::sess_os_to_meta_os;
3+
use metadata::loader::meta_section_name;
44

55
fn get_target_strs(target_os: session::os) -> target_strs::t {
66
return {

‎src/rustc/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import syntax::diagnostic;
1+
use syntax::diagnostic;
22
export diagnostic;
33

44
export driver;

‎src/rustc/driver/driver.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
// -*- rust -*-
2-
import metadata::{creader, cstore, filesearch};
3-
import session::{session, session_, OptLevel, No, Less, Default, Aggressive};
4-
import syntax::parse;
5-
import syntax::{ast, codemap};
6-
import syntax::attr;
7-
import middle::{trans, freevars, kind, ty, typeck, lint};
8-
import syntax::print::{pp, pprust};
9-
import util::ppaux;
10-
import back::link;
11-
import result::{Ok, Err};
12-
import std::getopts;
13-
import io::WriterUtil;
14-
import getopts::{optopt, optmulti, optflag, optflagopt, opt_present};
15-
import back::{x86, x86_64};
16-
import std::map::hashmap;
17-
import lib::llvm::llvm;
2+
use metadata::{creader, cstore, filesearch};
3+
use session::{session, session_, OptLevel, No, Less, Default, Aggressive};
4+
use syntax::parse;
5+
use syntax::{ast, codemap};
6+
use syntax::attr;
7+
use middle::{trans, freevars, kind, ty, typeck, lint};
8+
use syntax::print::{pp, pprust};
9+
use util::ppaux;
10+
use back::link;
11+
use result::{Ok, Err};
12+
use std::getopts;
13+
use io::WriterUtil;
14+
use getopts::{optopt, optmulti, optflag, optflagopt, opt_present};
15+
use back::{x86, x86_64};
16+
use std::map::hashmap;
17+
use lib::llvm::llvm;
1818

1919
enum pp_mode {ppm_normal, ppm_expanded, ppm_typed, ppm_identified,
2020
ppm_expanded_identified }

‎src/rustc/driver/rustc.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ use std(vers = "0.4");
66
use rustc(vers = "0.4");
77
use syntax(vers = "0.4");
88

9-
import core::*;
9+
use core::*;
1010

1111
// -*- rust -*-
12-
import result::{Ok, Err};
13-
import std::getopts;
14-
import std::map::hashmap;
15-
import getopts::{opt_present};
16-
import rustc::driver::driver::*;
17-
import syntax::codemap;
18-
import syntax::diagnostic;
19-
import rustc::driver::session;
20-
import rustc::middle::lint;
12+
use result::{Ok, Err};
13+
use std::getopts;
14+
use std::map::hashmap;
15+
use getopts::{opt_present};
16+
use rustc::driver::driver::*;
17+
use syntax::codemap;
18+
use syntax::diagnostic;
19+
use rustc::driver::session;
20+
use rustc::middle::lint;
2121

2222
fn version(argv0: ~str) {
2323
let mut vers = ~"unknown version";

‎src/rustc/driver/session.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
import syntax::{ast, codemap};
3-
import syntax::ast::node_id;
4-
import codemap::span;
5-
import syntax::ast::{int_ty, uint_ty, float_ty};
6-
import syntax::parse::parse_sess;
7-
import metadata::filesearch;
8-
import back::target_strs;
9-
import back::link;
10-
import middle::lint;
2+
use syntax::{ast, codemap};
3+
use syntax::ast::node_id;
4+
use codemap::span;
5+
use syntax::ast::{int_ty, uint_ty, float_ty};
6+
use syntax::parse::parse_sess;
7+
use metadata::filesearch;
8+
use back::target_strs;
9+
use back::link;
10+
use middle::lint;
1111

1212

1313
enum os { os_win32, os_macos, os_linux, os_freebsd, }

‎src/rustc/front/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import syntax::{ast, fold, attr};
1+
use syntax::{ast, fold, attr};
22

33
export strip_unconfigured_items;
44
export metas_in_cfg;

‎src/rustc/front/core_inject.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import driver::session::session;
2-
import syntax::codemap;
3-
import syntax::ast;
4-
import syntax::ast_util::*;
5-
import syntax::attr;
1+
use driver::session::session;
2+
use syntax::codemap;
3+
use syntax::ast;
4+
use syntax::ast_util::*;
5+
use syntax::attr;
66

77
export maybe_inject_libcore_ref;
88

‎src/rustc/front/intrinsic_inject.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import driver::session::session;
2-
import syntax::parse;
3-
import syntax::ast;
1+
use driver::session::session;
2+
use syntax::parse;
3+
use syntax::ast;
44

55
export inject_intrinsic;
66

‎src/rustc/front/test.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Code that generates a test runner to run all the tests in a crate
22

3-
import syntax::{ast, ast_util};
4-
import syntax::ast_util::*;
3+
use syntax::{ast, ast_util};
4+
use syntax::ast_util::*;
55
//import syntax::ast_util::dummy_sp;
6-
import syntax::fold;
7-
import syntax::print::pprust;
8-
import syntax::codemap::span;
9-
import driver::session;
10-
import session::session;
11-
import syntax::attr;
12-
import dvec::DVec;
6+
use syntax::fold;
7+
use syntax::print::pprust;
8+
use syntax::codemap::span;
9+
use driver::session;
10+
use session::session;
11+
use syntax::attr;
12+
use dvec::DVec;
1313

1414
export modify_for_testing;
1515

‎src/rustc/lib/llvm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import std::map::hashmap;
1+
use std::map::hashmap;
22

3-
import libc::{c_char, c_int, c_uint, c_longlong, c_ulonglong};
3+
use libc::{c_char, c_int, c_uint, c_longlong, c_ulonglong};
44

55
type Opcode = u32;
66
type Bool = c_uint;

‎src/rustc/metadata/creader.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
//! Validates all used crates and extern libraries and loads their metadata
22
3-
import syntax::diagnostic::span_handler;
4-
import syntax::{ast, ast_util};
5-
import syntax::attr;
6-
import syntax::visit;
7-
import syntax::codemap::span;
8-
import std::map::{hashmap, int_hash};
9-
import syntax::print::pprust;
10-
import filesearch::filesearch;
11-
import common::*;
12-
import dvec::DVec;
13-
import syntax::parse::token::ident_interner;
3+
use syntax::diagnostic::span_handler;
4+
use syntax::{ast, ast_util};
5+
use syntax::attr;
6+
use syntax::visit;
7+
use syntax::codemap::span;
8+
use std::map::{hashmap, int_hash};
9+
use syntax::print::pprust;
10+
use filesearch::filesearch;
11+
use common::*;
12+
use dvec::DVec;
13+
use syntax::parse::token::ident_interner;
1414

1515
export read_crates;
1616

‎src/rustc/metadata/csearch.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Searching for information from the cstore
22

3-
import std::{ebml};
4-
import syntax::ast;
5-
import syntax::ast_util;
6-
import syntax::ast_map;
7-
import middle::ty;
8-
import option::{Some, None};
9-
import syntax::diagnostic::span_handler;
10-
import syntax::diagnostic::expect;
11-
import ast_util::dummy_sp;
12-
import common::*;
13-
import std::map::hashmap;
14-
import dvec::DVec;
3+
use std::{ebml};
4+
use syntax::ast;
5+
use syntax::ast_util;
6+
use syntax::ast_map;
7+
use middle::ty;
8+
use option::{Some, None};
9+
use syntax::diagnostic::span_handler;
10+
use syntax::diagnostic::expect;
11+
use ast_util::dummy_sp;
12+
use common::*;
13+
use std::map::hashmap;
14+
use dvec::DVec;
1515

1616
export class_dtor;
1717
export get_symbol;

‎src/rustc/metadata/cstore.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// The crate store - a central repo for information collected about external
22
// crates and libraries
33

4-
import std::map;
5-
import std::map::hashmap;
6-
import syntax::{ast, attr};
7-
import syntax::ast_util::new_def_hash;
8-
import syntax::parse::token::ident_interner;
4+
use std::map;
5+
use std::map::hashmap;
6+
use syntax::{ast, attr};
7+
use syntax::ast_util::new_def_hash;
8+
use syntax::parse::token::ident_interner;
99

1010
export cstore;
1111
export cnum_map;

‎src/rustc/metadata/decoder.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// Decoding metadata from a single crate's metadata
22

3-
import std::{ebml, map};
4-
import std::map::{hashmap, str_hash};
5-
import io::WriterUtil;
6-
import dvec::DVec;
7-
import syntax::{ast, ast_util};
8-
import syntax::attr;
9-
import middle::ty;
10-
import syntax::ast_map;
11-
import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
3+
use std::{ebml, map};
4+
use std::map::{hashmap, str_hash};
5+
use io::WriterUtil;
6+
use dvec::DVec;
7+
use syntax::{ast, ast_util};
8+
use syntax::attr;
9+
use middle::ty;
10+
use syntax::ast_map;
11+
use tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
1212
parse_ident};
13-
import syntax::print::pprust;
14-
import cmd=cstore::crate_metadata;
15-
import util::ppaux::ty_to_str;
16-
import syntax::diagnostic::span_handler;
17-
import common::*;
18-
import syntax::parse::token::ident_interner;
13+
use syntax::print::pprust;
14+
use cmd=cstore::crate_metadata;
15+
use util::ppaux::ty_to_str;
16+
use syntax::diagnostic::span_handler;
17+
use common::*;
18+
use syntax::parse::token::ident_interner;
1919

2020

2121
export class_dtor;

0 commit comments

Comments
 (0)