Skip to content

Commit 3e9e574

Browse files
committed
Auto merge of rust-lang#115066 - allaboutevemirolive:pluralize_macro, r=Nilstrieb
Redefine the pluralize macro's arm Redefine the unintuitive pluralize macro's arm because of the negation. The initial code starts with check if count is not 1, which is confusing and unintuitive. The arm shoud start with checking, - if "count" `is 1` then, append `""` (empty string) - indicate as singular - Then check if "count" `is not 1` (more than 1), append `"s"` - indicate as plural Before: ```rs // This arm is abit confusing since it start with checking, if "count" is more than 1, append "s". ($x:expr) => { if $x != 1 { "s" } else { "" } }; ``` After: ```rs // Pluralize based on count (e.g., apples) ($x:expr) => { if $x == 1 { "" } else { "s" } }; ```
2 parents d8c69df + 5dce0e6 commit 3e9e574

File tree

1 file changed

+2
-1
lines changed
  • compiler/rustc_lint_defs/src

1 file changed

+2
-1
lines changed

compiler/rustc_lint_defs/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ pub mod builtin;
2323

2424
#[macro_export]
2525
macro_rules! pluralize {
26+
// Pluralize based on count (e.g., apples)
2627
($x:expr) => {
27-
if $x != 1 { "s" } else { "" }
28+
if $x == 1 { "" } else { "s" }
2829
};
2930
("has", $x:expr) => {
3031
if $x == 1 { "has" } else { "have" }

0 commit comments

Comments
 (0)