Skip to content

Commit 8894466

Browse files
dtolnayytmimi
authored andcommitted
Print empty commit info without trailing hyphen
1 parent 15c75fe commit 8894466

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/bin/main.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,14 @@ are included as out of line modules from `src/lib.rs`."
450450
}
451451

452452
fn print_version() {
453-
let version_info = format!(
454-
"{}-{}",
455-
option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"),
456-
include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
457-
);
453+
let version_number = option_env!("CARGO_PKG_VERSION").unwrap_or("unknown");
454+
let commit_info = include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"));
458455

459-
println!("rustfmt {version_info}");
456+
if commit_info.is_empty() {
457+
println!("rustfmt {version_number}");
458+
} else {
459+
println!("rustfmt {version_number}-{commit_info}");
460+
}
460461
}
461462

462463
fn determine_operation(matches: &Matches) -> Result<Operation, OperationError> {

0 commit comments

Comments
 (0)