nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-16 22:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #26863 - brson:revert-stageversion, r=alexcrichton

Browse Source 
This reverts https://github.com/rust-lang/rust/pull/26599, which puts the stage number in the output of `--version -v`, but is not supposed to put it in the 'stage2' compiler, which is what most people refer to the binary we deploy.

The picture is not so clear though because of how stage 'promotions' happen in the build and also because the windows build deploys stage3, not stage2.

cc @richo
This commit is contained in:
bors 2015-07-08 07:26:42 +00:00
commit 50df2a09b8
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc_driver/lib.rs
View File

@ -481,17 +481,6 @@ pub fn commit_date_str() -> Option<&'static str> {
option_env!("CFG_VER_DATE")
}
/// Returns a stage string, such as "stage0".
pub fn stage_str() -> Option<&'static str> {
if cfg!(stage0) {
Some("stage0")
} else if cfg!(stage1) {
Some("stage1")
} else {
None
}
}
/// Prints version information
pub fn version(binary: &str, matches: &getopts::Matches) {
let verbose = matches.opt_present("verbose");
@ -504,9 +493,6 @@ pub fn version(binary: &str, matches: &getopts::Matches) {
println!("commit-date: {}", unw(commit_date_str()));
println!("host: {}", config::host_triple());
println!("release: {}", unw(release_str()));
if let Some(stage) = stage_str() {
println!("stage: {}", stage);
}
}
}