Skip to content

Commit

Permalink
Fix version string.
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuss committed Jul 26, 2021
1 parent 9535dc3 commit fdc398e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/bin/cargo/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit fdc398e

Please sign in to comment.