Skip to content

Conversation

Dylan-DPC
Copy link
Member

@Dylan-DPC Dylan-DPC commented Mar 15, 2022

Rework of #94603 which got closed as I was trying to unmerge and repush. This is a subset of changes from the original pr as I sed'd whatever typos I remembered from the original PR

thanks to @cuishuang for the original PR

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 15, 2022
@rust-highfive
Copy link
Contributor

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Contributor

r? @nagisa

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 15, 2022
@matthiaskrgr
Copy link
Member

I think it would be fair to use the original author as commit author? 🙃

@cuishuang
Copy link
Contributor

I think it would be fair to use the original author as commit author? 🙃

Thanks. I guess that's not a problem.
It is recommended to integrate such work into ci later

@oli-obk
Copy link
Contributor

oli-obk commented Mar 15, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 15, 2022

📌 Commit 13e8899 has been approved by oli-obk

@bors bors 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 Mar 15, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2022
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#94810 (debuginfo: Fix bug in type name generation for dyn types with associated types but no other generic arguments.)
 - rust-lang#94947 (fix typos)
 - rust-lang#94956 (Fix small typo in FIXME)
 - rust-lang#94958 (Support other types of pluralization in pluralize macro)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 277802e into rust-lang:master Mar 15, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants