itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix version string.

Browse Source
This commit is contained in:
Eric Huss 2021-07-26 12:18:22 -07:00
parent 9535dc3dfd
commit fdc398e743
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 { pub fn get_version_string(is_verbose: bool) -> String {
let version = cargo::version(); let version = cargo::version();
let mut version_string = version.to_string(); let mut version_string = format!("cargo {}\n", version);
version_string.push('\n');
if is_verbose { if is_verbose {
version_string.push_str(&format!( version_string.push_str(&format!(
"release: {}.{}.{}\n", "release: {}.{}.{}\n",

4
tests/testsuite/version.rs
View File

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