fix(lints): plural form correctly

weihanglo · weihanglo · commit b3d07f74e451 · 2025-12-01T13:25:56.000-05:00
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -1299,7 +1299,8 @@ impl<'gctx> Workspace<'gctx> {
         }
 
         if error_count > 0 {
-            bail!("encountered {error_count} errors(s) while running lints")
+            let plural = if error_count == 1 { "" } else { "s" };
+            bail!("encountered {error_count} error{plural} while running lints")
         } else {
             Ok(())
         }
diff --git a/tests/testsuite/lints/error/stderr.term.svg b/tests/testsuite/lints/error/stderr.term.svg
@@ -33,7 +33,7 @@
 </tspan>
     <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">= </tspan><tspan class="bold">note</tspan><tspan>: `cargo::im_a_teapot` is set to `deny` in `[lints]`</tspan>
 </tspan>
-    <tspan x="10px" y="154px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 errors(s) while running lints</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 error while running lints</tspan>
 </tspan>
     <tspan x="10px" y="172px">
 </tspan>
diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
@@ -83,7 +83,7 @@ test_dummy_unstable = { level = "forbid", priority = -1 }
   | ^^^^^^^^^^^^^^^^^^
   |
   = [NOTE] `cargo::im_a_teapot` is set to `forbid` in `[lints]`
-[ERROR] encountered 1 errors(s) while running lints
+[ERROR] encountered 1 error while running lints
 
 "#]])
         .run();
@@ -126,7 +126,7 @@ workspace = true
    | ^^^^^^^^^^^^^^^^^^
    |
    = [NOTE] `cargo::im_a_teapot` is set to `forbid` in `[lints]`
-[ERROR] encountered 1 errors(s) while running lints
+[ERROR] encountered 1 error while running lints
 
 "#]])
         .run();

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,8 @@ impl<'gctx> Workspace<'gctx> {`
`1299`	`1299`	`}`
`1300`	`1300`
`1301`	`1301`	`if error_count > 0 {`
`1302`		`- bail!("encountered {error_count} errors(s) while running lints")`
	`1302`	`+ let plural = if error_count == 1 { "" } else { "s" };`
	`1303`	`+ bail!("encountered {error_count} error{plural} while running lints")`
`1303`	`1304`	`} else {`
`1304`	`1305`	`Ok(())`
`1305`	`1306`	`}`