itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #9727 - ehuss:fix-version, r=alexcrichton

Browse Source 
Fix version string.

The version string for `cargo version` was inadvertently changed in #9657 so that it does not include the leading `cargo` as in `cargo 1.53.0 (4369396ce 2021-04-27)`.
This commit is contained in:
bors 2021-07-26 20:23:21 +00:00
commit d21c22870e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/cargo/cli.rs
View File

@ -137,8 +137,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'",
pub fn get_version_string(is_verbose: bool) -> String {
let version = cargo::version();
let mut version_string = version.to_string();
version_string.push('\n');
let mut version_string = format!("cargo {}\n", version);
if is_verbose {
version_string.push_str(&format!(
"release: {}.{}.{}\n",

4
tests/testsuite/version.rs
View File

@ -7,11 +7,11 @@ fn simple() {
let p = project().build();
p.cargo("version")
.with_stdout(&format!("{}\n", cargo::version()))
.with_stdout(&format!("cargo {}\n", cargo::version()))
.run();
p.cargo("--version")
.with_stdout(&format!("{}\n", cargo::version()))
.with_stdout(&format!("cargo {}\n", cargo::version()))
.run();
}