Skip to content

Fixed numerus of error message - #89478

Merged
bors merged 1 commit into
rust-lang:masterfrom
zvavybir:master
Oct 5, 2021
Merged

Fixed numerus of error message#89478
bors merged 1 commit into
rust-lang:masterfrom
zvavybir:master

Conversation

@zvavybir

Copy link
Copy Markdown
Contributor

When there are redundant trait requirements and these are hidden, a message is generated by the following code snippet:
format!("{} redundant requirements hidden", count)
But if there is only a single hidden requirement, it will still print this message in plural instead of singular.

@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @matthewjasper (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2021
@rust-log-analyzer

This comment has been minimized.

Comment threadcompiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@jyn514

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 3, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit d20e7cec020e6cc008be808f9b5c958e1b943018 has been approved by jyn514

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2021
@klensy

Copy link
Copy Markdown
Contributor

4 commits, squash maybe?

@Mark-Simulacrum

Mark-Simulacrum commented Oct 3, 2021

Copy link
Copy Markdown
Member

@bors r-

Yes, let's squash the commits.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 3, 2021
Fixed numerus of error message
Removed superfluous argument
Using pluralize!() instead of code duplication
Adjusted a test
@jyn514

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Oct 3, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit d6a7e74 has been approved by jyn514

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 3, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 5, 2021
Fixed numerus of error message
When there are redundant trait requirements and these are hidden, a message is generated by the following code snippet:
`format!("{} redundant requirements hidden", count)`
But if there is only a single hidden requirement, it will still print this message in plural instead of singular.
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 5, 2021
Fixed numerus of error message
When there are redundant trait requirements and these are hidden, a message is generated by the following code snippet:
`format!("{} redundant requirements hidden", count)`
But if there is only a single hidden requirement, it will still print this message in plural instead of singular.
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 5, 2021
Fixed numerus of error message
When there are redundant trait requirements and these are hidden, a message is generated by the following code snippet:
`format!("{} redundant requirements hidden", count)`
But if there is only a single hidden requirement, it will still print this message in plural instead of singular.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 5, 2021
…ingjubilee
Rollup of 15 pull requests
Successful merges:
- rust-lang#87993 (Stabilize try_reserve)
- rust-lang#88090 (Perform type inference in range pattern)
- rust-lang#88780 (Added abs_diff for integer types.)
- rust-lang#89270 (path.push() should work as expected on windows verbatim paths)
- rust-lang#89413 (Correctly handle supertraits for min_specialization)
- rust-lang#89456 (Update to the final LLVM 13.0.0 release)
- rust-lang#89466 (Fix bug with query modifier parsing)
- rust-lang#89473 (Fix extra `non_snake_case` warning for shorthand field bindings)
- rust-lang#89474 (rustdoc: Improve doctest pass's name and module's name)
- rust-lang#89478 (Fixed numerus of error message)
- rust-lang#89480 (Add test for issue 89118.)
- rust-lang#89487 (Try to recover from a `=>` -> `=` or `->` typo in a match arm)
- rust-lang#89494 (Deny `where` clauses on `auto` traits)
- rust-lang#89511 (:arrow_up: rust-analyzer)
- rust-lang#89536 (update Miri)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit ec41455 into rust-lang:masterOct 5, 2021
@rustbotrustbot added this to the 1.57.0 milestone Oct 5, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@zvavybir@rust-highfive@rust-log-analyzer@jyn514@bors@klensy@Mark-Simulacrum@matthewjasper@rustbot