Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Specify the kind of the item for E0121 #86223

Merged
merged 3 commits into from
Jun 23, 2021
Merged

Specify the kind of the item for E0121 #86223

merged 3 commits into from
Jun 23, 2021

Conversation

fee1-dead
Copy link
Member

Fixes #86005

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 Jun 11, 2021
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2021
@fee1-dead
Copy link
Member Author

@rustbot label -S-waiting-on-author S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 12, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fee1-dead
Copy link
Member Author

mingw-check has timed out. Force pushing amend commit with no changes to retrigger CI.

@bors

This comment has been minimized.

Sign in to view
@fee1-dead fee1-dead requested a review from petrochenkov June 18, 2021 15:06
@fee1-dead
Copy link
Member Author

fee1-dead commented Jun 18, 2021 •
edited
Loading

I have split the single commit into two, because a lot of the changes were in ui tests and not in compiler/rustc_*.

The diff of the first commit can be easier to review.

@petrochenkov
Copy link
Contributor

Seems fine.
@bors r+

@bors
Copy link
Contributor

bors commented Jun 20, 2021

📌 Commit 6d99f54 has been approved by petrochenkov

@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 Jun 20, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 21, 2021
@JohnTitor
Rollup merge of rust-lang#86223 - fee1-dead:better-E0121, r=petrochenkov
e972385 
Specify the kind of the item for E0121

Fixes rust-lang#86005
@JohnTitor JohnTitor mentioned this pull request Jun 21, 2021
Closed
@fee1-dead
Copy link
Member Author

fee1-dead commented Jun 21, 2021 •
edited
Loading

@bors r=petrochenkov

I only added a commit to fix builds after #83739.

(I wanted to see if I have the rights :p)

cc @petrochenkov
@rustbot label -S-waiting-on-bors S-waiting-on-review

@bors
Copy link
Contributor

bors commented Jun 21, 2021

@fee1-dead: 🔑 Insufficient privileges: Not in reviewers

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2021
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 21, 2021

📌 Commit e66f241 has been approved by petrochenkov

@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 Jun 21, 2021
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Jun 22, 2021
@fee1-dead
Rollup merge of rust-lang#86223 - fee1-dead:better-E0121, r=petrochenkov
4e1e6d8 
Specify the kind of the item for E0121

Fixes rust-lang#86005
@fee1-dead fee1-dead mentioned this pull request Jun 22, 2021
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 22, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 22, 2021
@bors
Auto merge of rust-lang#86559 - Dylan-DPC:rollup-aixg3q5, r=Dylan-DPC
574c9dd 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#86223 (Specify the kind of the item for E0121)
 - rust-lang#86521 (Add comments around code where ordering is important due for panic-safety)
 - rust-lang#86523 (Improvements to intra-doc link macro disambiguators)
 - rust-lang#86542 (Line numbers aligned with content)
 - rust-lang#86549 (Add destructuring example of E0508)
 - rust-lang#86557 (Update books)

Failed merges:

 - rust-lang#86548 (Fix crate filter search reset)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit af9e5d1 into rust-lang:master Jun 23, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 23, 2021
@fee1-dead fee1-dead deleted the better-E0121 branch July 19, 2024 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov approved these changes

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.

The meaning of an "item" in E0121 should be elaborated on
6 participants
@fee1-dead @rust-highfive @rust-log-analyzer @bors @petrochenkov @rustbot