Skip to content

Commit 44cd754

Browse files
committed
Do not pluralize "file" in progress message if there is only one
1 parent da4de3b commit 44cd754

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

rust/private/rustc.bzl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,11 +1424,12 @@ def rustc_compile_action(
14241424
env = env,
14251425
arguments = args.all,
14261426
mnemonic = "Rustc",
1427-
progress_message = "Compiling Rust {} {}{} ({} files)".format(
1427+
progress_message = "Compiling Rust {} {}{} ({} file{})".format(
14281428
crate_info.type,
14291429
ctx.label.name,
14301430
formatted_version,
14311431
len(srcs),
1432+
"" if len(srcs) == 1 else "s",
14321433
),
14331434
toolchain = "@rules_rust//rust:toolchain_type",
14341435
resource_set = get_rustc_resource_set(toolchain),
@@ -1441,11 +1442,12 @@ def rustc_compile_action(
14411442
env = env,
14421443
arguments = args_metadata.all,
14431444
mnemonic = "RustcMetadata",
1444-
progress_message = "Compiling Rust metadata {} {}{} ({} files)".format(
1445+
progress_message = "Compiling Rust metadata {} {}{} ({} file{})".format(
14451446
crate_info.type,
14461447
ctx.label.name,
14471448
formatted_version,
14481449
len(srcs),
1450+
"" if len(srcs) == 1 else "s",
14491451
),
14501452
toolchain = "@rules_rust//rust:toolchain_type",
14511453
)
@@ -1460,11 +1462,12 @@ def rustc_compile_action(
14601462
env = env,
14611463
arguments = [args.rustc_path, args.rustc_flags],
14621464
mnemonic = "Rustc",
1463-
progress_message = "Compiling Rust (without process_wrapper) {} {}{} ({} files)".format(
1465+
progress_message = "Compiling Rust (without process_wrapper) {} {}{} ({} file{})".format(
14641466
crate_info.type,
14651467
ctx.label.name,
14661468
formatted_version,
14671469
len(srcs),
1470+
"" if len(srcs) == 1 else "s",
14681471
),
14691472
toolchain = "@rules_rust//rust:toolchain_type",
14701473
resource_set = get_rustc_resource_set(toolchain),

0 commit comments

Comments
 (0)