Skip to content

reduce the usage of explicit version markers #6606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

reduce the usage of explicit version markers #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiletest/compiletest.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#[allow(non_camel_case_types)];

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

use core::*;

Expand Down
12 changes: 6 additions & 6 deletions src/driver/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
2 changes: 1 addition & 1 deletion src/libcore/core.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/libfuzzer/fuzzer.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/librust/rust.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions src/librustc/rustc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
6 changes: 3 additions & 3 deletions src/librustdoc/rustdoc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/librusti/rusti.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/librustpkg/rustpkg.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/syntax.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down