From 20ef4238bb63686d5af951acfba5468959be861d Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 19 May 2013 00:21:41 -0400 Subject: [PATCH] reduce the usage of explicit version markers --- src/compiletest/compiletest.rc | 2 +- src/driver/driver.rs | 12 ++++++------ src/libcore/core.rc | 2 +- src/libfuzzer/fuzzer.rc | 4 ++-- src/librust/rust.rc | 8 ++++---- src/librustc/rustc.rc | 5 ++--- src/librustdoc/rustdoc.rc | 6 +++--- src/librusti/rusti.rc | 6 +++--- src/librustpkg/rustpkg.rc | 6 +++--- src/libsyntax/syntax.rc | 2 +- 10 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rc index dedf465b56d..5d703f67213 100644 --- a/src/compiletest/compiletest.rc +++ b/src/compiletest/compiletest.rc @@ -12,7 +12,7 @@ #[allow(non_camel_case_types)]; -extern mod std(vers = "0.7-pre"); +extern mod std; use core::*; diff --git a/src/driver/driver.rs b/src/driver/driver.rs index 70dc9e895c0..b8bd79eedbb 100644 --- a/src/driver/driver.rs +++ b/src/driver/driver.rs @@ -9,21 +9,21 @@ // except according to those terms. #[cfg(rustpkg)] -extern mod this(name = "rustpkg", vers = "0.7-pre"); +extern mod this(name = "rustpkg"); #[cfg(fuzzer)] -extern mod this(name = "fuzzer", vers = "0.7-pre"); +extern mod this(name = "fuzzer"); #[cfg(rustdoc)] -extern mod this(name = "rustdoc", vers = "0.7-pre"); +extern mod this(name = "rustdoc"); #[cfg(rusti)] -extern mod this(name = "rusti", vers = "0.7-pre"); +extern mod this(name = "rusti"); #[cfg(rust)] -extern mod this(name = "rust", vers = "0.7-pre"); +extern mod this(name = "rust"); #[cfg(rustc)] -extern mod this(name = "rustc", vers = "0.7-pre"); +extern mod this(name = "rustc"); fn main() { this::main() } diff --git a/src/libcore/core.rc b/src/libcore/core.rc index eb94e9ca028..60093ff96bb 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -63,7 +63,7 @@ they contained the following prologue: #[deny(non_camel_case_types)]; // Make core testable by not duplicating lang items. See #2912 -#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre"); +#[cfg(test)] extern mod realcore(name = "core"); #[cfg(test)] pub use kinds = realcore::kinds; #[cfg(test)] pub use ops = realcore::ops; #[cfg(test)] pub use cmp = realcore::cmp; diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc index 59a715e7f90..6662af3b596 100644 --- a/src/libfuzzer/fuzzer.rc +++ b/src/libfuzzer/fuzzer.rc @@ -20,8 +20,8 @@ #[allow(non_camel_case_types)]; -extern mod std(vers = "0.7-pre"); -extern mod syntax(vers = "0.7-pre"); +extern mod std; +extern mod syntax; use core::run; diff --git a/src/librust/rust.rc b/src/librust/rust.rc index 92510be56c3..7b3585af9b4 100644 --- a/src/librust/rust.rc +++ b/src/librust/rust.rc @@ -20,10 +20,10 @@ #[license = "MIT/ASL2"]; #[crate_type = "lib"]; -extern mod rustpkg(vers = "0.7-pre"); -extern mod rustdoc(vers = "0.7-pre"); -extern mod rusti(vers = "0.7-pre"); -extern mod rustc(vers = "0.7-pre"); +extern mod rustpkg; +extern mod rustdoc; +extern mod rusti; +extern mod rustc; use core::run; diff --git a/src/librustc/rustc.rc b/src/librustc/rustc.rc index 6027a044541..e3d19e38559 100644 --- a/src/librustc/rustc.rc +++ b/src/librustc/rustc.rc @@ -21,9 +21,8 @@ #[allow(non_camel_case_types)]; #[deny(deprecated_pattern)]; -extern mod std(vers = "0.7-pre"); -extern mod syntax(vers = "0.7-pre"); - +extern mod std; +extern mod syntax; use driver::driver::{host_triple, optgroups, early_error}; use driver::driver::{str_input, file_input, build_session_options}; diff --git a/src/librustdoc/rustdoc.rc b/src/librustdoc/rustdoc.rc index 333ea5bce2f..fed8bc0e972 100644 --- a/src/librustdoc/rustdoc.rc +++ b/src/librustdoc/rustdoc.rc @@ -21,9 +21,9 @@ #[allow(non_implicitly_copyable_typarams)]; -extern mod std(vers = "0.7-pre"); -extern mod rustc(vers = "0.7-pre"); -extern mod syntax(vers = "0.7-pre"); +extern mod std; +extern mod rustc; +extern mod syntax; use config::Config; use doc::Item; diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rc index 4a03d31e5db..3ec19ce1a14 100644 --- a/src/librusti/rusti.rc +++ b/src/librusti/rusti.rc @@ -18,9 +18,9 @@ #[license = "MIT/ASL2"]; #[crate_type = "lib"]; -extern mod std(vers = "0.7-pre"); -extern mod rustc(vers = "0.7-pre"); -extern mod syntax(vers = "0.7-pre"); +extern mod std; +extern mod rustc; +extern mod syntax; use core::*; use core::cell::Cell; diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc index a69613776ef..f1ba759acd7 100644 --- a/src/librustpkg/rustpkg.rc +++ b/src/librustpkg/rustpkg.rc @@ -18,9 +18,9 @@ #[license = "MIT/ASL2"]; #[crate_type = "lib"]; -extern mod std(vers = "0.7-pre"); -extern mod rustc(vers = "0.7-pre"); -extern mod syntax(vers = "0.7-pre"); +extern mod std; +extern mod rustc; +extern mod syntax; use core::*; pub use core::path::Path; diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc index 565a8a18c6f..0d9b7ca429e 100644 --- a/src/libsyntax/syntax.rc +++ b/src/libsyntax/syntax.rc @@ -23,7 +23,7 @@ #[allow(non_camel_case_types)]; #[deny(deprecated_pattern)]; -extern mod std(vers = "0.7-pre"); +extern mod std; // allow the interner_key macro // to escape this module: