Skip to content

Commit aa82783

Browse files
committed
auto merge of #6606 : thestinger/rust/vers, r=brson
I don't see a reason to encode this information in all the `extern mod` statements, it's not a precise enough version to actually provide any sort of robustness.
2 parents ccf6353 + 20ef423 commit aa82783

File tree

10 files changed

+26
-27
lines changed

10 files changed

+26
-27
lines changed

src/compiletest/compiletest.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#[allow(non_camel_case_types)];
1414

15-
extern mod std(vers = "0.7-pre");
15+
extern mod std;
1616

1717
use core::*;
1818

src/driver/driver.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
// except according to those terms.
1010

1111
#[cfg(rustpkg)]
12-
extern mod this(name = "rustpkg", vers = "0.7-pre");
12+
extern mod this(name = "rustpkg");
1313

1414
#[cfg(fuzzer)]
15-
extern mod this(name = "fuzzer", vers = "0.7-pre");
15+
extern mod this(name = "fuzzer");
1616

1717
#[cfg(rustdoc)]
18-
extern mod this(name = "rustdoc", vers = "0.7-pre");
18+
extern mod this(name = "rustdoc");
1919

2020
#[cfg(rusti)]
21-
extern mod this(name = "rusti", vers = "0.7-pre");
21+
extern mod this(name = "rusti");
2222

2323
#[cfg(rust)]
24-
extern mod this(name = "rust", vers = "0.7-pre");
24+
extern mod this(name = "rust");
2525

2626
#[cfg(rustc)]
27-
extern mod this(name = "rustc", vers = "0.7-pre");
27+
extern mod this(name = "rustc");
2828

2929
fn main() { this::main() }

src/libcore/core.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ they contained the following prologue:
6363
#[deny(non_camel_case_types)];
6464

6565
// Make core testable by not duplicating lang items. See #2912
66-
#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre");
66+
#[cfg(test)] extern mod realcore(name = "core");
6767
#[cfg(test)] pub use kinds = realcore::kinds;
6868
#[cfg(test)] pub use ops = realcore::ops;
6969
#[cfg(test)] pub use cmp = realcore::cmp;

src/libfuzzer/fuzzer.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#[allow(non_camel_case_types)];
2222

23-
extern mod std(vers = "0.7-pre");
24-
extern mod syntax(vers = "0.7-pre");
23+
extern mod std;
24+
extern mod syntax;
2525

2626
use core::run;
2727

src/librust/rust.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#[license = "MIT/ASL2"];
2121
#[crate_type = "lib"];
2222

23-
extern mod rustpkg(vers = "0.7-pre");
24-
extern mod rustdoc(vers = "0.7-pre");
25-
extern mod rusti(vers = "0.7-pre");
26-
extern mod rustc(vers = "0.7-pre");
23+
extern mod rustpkg;
24+
extern mod rustdoc;
25+
extern mod rusti;
26+
extern mod rustc;
2727

2828
use core::run;
2929

src/librustc/rustc.rc

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
#[allow(non_camel_case_types)];
2222
#[deny(deprecated_pattern)];
2323

24-
extern mod std(vers = "0.7-pre");
25-
extern mod syntax(vers = "0.7-pre");
26-
24+
extern mod std;
25+
extern mod syntax;
2726

2827
use driver::driver::{host_triple, optgroups, early_error};
2928
use driver::driver::{str_input, file_input, build_session_options};

src/librustdoc/rustdoc.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#[allow(non_implicitly_copyable_typarams)];
2323

24-
extern mod std(vers = "0.7-pre");
25-
extern mod rustc(vers = "0.7-pre");
26-
extern mod syntax(vers = "0.7-pre");
24+
extern mod std;
25+
extern mod rustc;
26+
extern mod syntax;
2727

2828
use config::Config;
2929
use doc::Item;

src/librusti/rusti.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#[license = "MIT/ASL2"];
1919
#[crate_type = "lib"];
2020

21-
extern mod std(vers = "0.7-pre");
22-
extern mod rustc(vers = "0.7-pre");
23-
extern mod syntax(vers = "0.7-pre");
21+
extern mod std;
22+
extern mod rustc;
23+
extern mod syntax;
2424

2525
use core::*;
2626
use core::cell::Cell;

src/librustpkg/rustpkg.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#[license = "MIT/ASL2"];
1919
#[crate_type = "lib"];
2020

21-
extern mod std(vers = "0.7-pre");
22-
extern mod rustc(vers = "0.7-pre");
23-
extern mod syntax(vers = "0.7-pre");
21+
extern mod std;
22+
extern mod rustc;
23+
extern mod syntax;
2424

2525
use core::*;
2626
pub use core::path::Path;

src/libsyntax/syntax.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#[allow(non_camel_case_types)];
2424
#[deny(deprecated_pattern)];
2525

26-
extern mod std(vers = "0.7-pre");
26+
extern mod std;
2727

2828
// allow the interner_key macro
2929
// to escape this module:

0 commit comments

Comments
 (0)