Skip to content

Correct pluralisation of various diagnostic messages - #64233

Merged
bors merged 2 commits into
rust-lang:masterfrom
varkor:correct-pluralisation
Sep 7, 2019
Merged

Correct pluralisation of various diagnostic messages#64233
bors merged 2 commits into
rust-lang:masterfrom
varkor:correct-pluralisation

Conversation

@varkor

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2019
@varkor

Copy link
Copy Markdown
ContributorAuthor

r? @estebank

@rust-highfiverust-highfive assigned estebank and unassigned eddybSep 6, 2019
match n.try_eval_usize(tcx, ty::ParamEnv::empty()) {
Some(n) => format!("array of {} elements", n).into(),
Some(n) => {
format!("array of {} element{}", n, if n != 1 { "s" } else { "" }).into()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if $n != 1 { "s" } else { "" } business should be refactored to a function in some utility module in rustc_errors. Would be good to grep for "s" } else { "".

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would make a nice beginner issue. I'll open one.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened #64238.

@estebank

Copy link
Copy Markdown
Contributor

@bors r+ conditioned on following up on #64238.

@bors

bors commented Sep 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0b97726 has been approved by estebank

@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 Sep 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 7, 2019
…ebank
Correct pluralisation of various diagnostic messages
@CentrilCentril mentioned this pull request Sep 7, 2019
bors added a commit that referenced this pull request Sep 7, 2019
Rollup of 10 pull requests
Successful merges:
- #63919 (Use hygiene for AST passes)
- #63927 (Filter linkcheck spurious failure)
- #64149 (rustc_codegen_llvm: give names to non-alloca variable values.)
- #64192 (Bail out when encountering likely missing turbofish in parser)
- #64231 (Move the HIR CFG to `rustc_ast_borrowck`)
- #64233 (Correct pluralisation of various diagnostic messages)
- #64236 (reduce visibility)
- #64240 (Include compiler-rt in the source tarball)
- #64241 ([doc] Added more prereqs and note about default directory)
- #64243 (Move injection of attributes from command line to `libsyntax_ext`)
Failed merges:
r? @ghost
@bors
bors merged commit 0b97726 into rust-lang:masterSep 7, 2019
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.

6 participants

@varkor@rust-highfive@estebank@bors@Centril@eddyb