Skip to content

Commit d13c0c7

Browse files
committed
Explicitly use version 0.2 of crates
1 parent c83d61d commit d13c0c7

File tree

12 files changed

+53
-21
lines changed

12 files changed

+53
-21
lines changed

src/cargo/cargo.rc

+8
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@
1717

1818
#[crate_type = "bin"];
1919

20+
#[no_core];
21+
22+
use core(vers = "0.2");
23+
use std(vers = "0.2");
24+
use rustc(vers = "0.2");
25+
26+
import core::*;
27+
2028
mod pgp;

src/cargo/cargo.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// cargo.rs - Rust package manager
22

3-
use rustc;
4-
use std;
5-
63
import rustc::syntax::{ast, codemap};
74
import rustc::syntax::parse::parser;
85
import rustc::util::filesearch::{get_cargo_root, get_cargo_root_nearest,

src/cargo/pgp.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std;
2-
31
fn gpg(args: [str]) -> { status: int, out: str, err: str } {
42
ret run::program_output("gpg", args);
53
}

src/compiletest/compiletest.rc

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#[crate_type = "bin"];
22

3-
use std;
3+
#[no_core];
4+
5+
use core(vers = "0.2");
6+
use std(vers = "0.2");
7+
8+
import core::*;
49

510
mod procsrv;
611
mod util;

src/fuzzer/fuzzer.rc

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
#[crate_type = "bin"];
44

5-
use std;
6-
use rustc;
5+
#[no_core];
6+
7+
use core(vers = "0.2");
8+
use std(vers = "0.2");
9+
use rustc(vers = "0.2");
10+
11+
import core::*;
712

813
// Local Variables:
914
// fill-column: 78;

src/libcore/core.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod core {
4040
// Similar to above. Some magic to make core testable.
4141
#[cfg(test)]
4242
mod std {
43-
use std;
43+
use std(vers = "0.2");
4444
import std::test;
4545
}
4646

src/librustsyntax/ext/simplext.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std;
2-
31
import codemap::span;
42
import std::map::{hashmap, str_hash};
53

src/librustsyntax/rustsyntax.rc

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
#[crate_type = "lib"];
66

7-
use std;
7+
#[no_core];
8+
9+
use core(vers = "0.2");
10+
use std(vers = "0.2");
11+
12+
import core::*;
813

914
mod attr;
1015
mod diagnostic;

src/libstd/std.rc

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
#[crate_type = "lib"];
99
#[doc = "The Rust standard library"];
1010

11+
#[no_core];
12+
13+
use core(vers = "0.2");
14+
import core::*;
15+
1116
export net, uv;
1217
export c_vec, four, tri, util;
1318
export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap, ufind;
1419
export rope, arena;
1520
export ebml, dbg, getopts, json, rand, sha1, term, time, prettyprint;
1621
export test, tempfile, serialization;
1722

18-
1923
// General io and system-services modules
2024

2125
mod net;

src/rustc/driver/rustc.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
use std;
2-
use rustc;
1+
#[no_core];
2+
3+
use core(vers = "0.2");
4+
use std(vers = "0.2");
5+
use rustc(vers = "0.2");
6+
7+
import core::*;
38

49
// -*- rust -*-
510
import result::{ok, err};

src/rustc/rustc.rc

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
#[license = "MIT"];
1010
#[crate_type = "lib"];
1111

12-
use std (name = "std",
13-
vers = "0.2",
14-
url = "https://github.com/mozilla/rust/tree/master/src/libstd");
12+
#[no_core];
1513

16-
use rustsyntax;
14+
use core(vers = "0.2");
15+
use std(vers = "0.2");
16+
use rustsyntax(vers = "0.2");
17+
18+
import core::*;
1719

1820
mod middle {
1921
mod trans {

src/rustdoc/rustdoc.rc

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
#[license = "MIT"];
1010
#[crate_type = "bin"];
1111

12-
use std;
13-
use rustc;
12+
#[no_core];
13+
14+
use core(vers = "0.2");
15+
use std(vers = "0.2");
16+
use rustc(vers = "0.2");
17+
18+
import core::*;
1419

1520
mod config;
1621
mod parse;

0 commit comments

Comments
 (0)