Skip to content

Conversation

jesusprubio
Copy link
Contributor

Helps with #61137

@rust-highfive
Copy link
Contributor

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @lcnr

(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 Feb 6, 2021
@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup squash

@bors
Copy link
Collaborator

bors commented Feb 7, 2021

📌 Commit 3691878 has been approved by GuillaumeGomez

@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 Feb 7, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2021
…laumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#81526 (btree: use Option's unwrap_unchecked())
 - rust-lang#81742 (Add a note about the correctness and the effect on unsafe code to the `ExactSizeIterator` docs)
 - rust-lang#81830 (Add long error explanation for E0542)
 - rust-lang#81835 (Improve long explanation for E0546)
 - rust-lang#81843 (Add regression test for rust-lang#29821)

Failed merges:

 - rust-lang#81836 (Add long explanation for E0547)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Feb 7, 2021

☔ The latest upstream changes (presumably #81853) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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 Feb 7, 2021
@GuillaumeGomez
Copy link
Member

Generally we use rebase instead of merge to fix conflicts. However, I don't know if it's a requirement or not...

@@ -0,0 +1,37 @@
The `issue` value is missing in a stability attribute.
Copy link
Contributor

Choose a reason for hiding this comment

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

Would this be clearer if it is flipped? I wonder if the term is called "value"?

Suggested change
The `issue` value is missing in a stability attribute.
A stability attribute is missing `issue`.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Honestly, I can't see any benefit. Anyway, it's not a big deal for me :).

@GuillaumeGomez , what do you think?

Copy link
Member

Choose a reason for hiding this comment

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

I find the suggested one more difficult to understand.

@jesusprubio
Copy link
Contributor Author

Generally we use rebase instead of merge to fix conflicts. However, I don't know if it's a requirement or not...

My fault :), I'm starting a new PR and closing this one.

@jesusprubio
Copy link
Contributor Author

Closing in favor of: #81925

@jesusprubio jesusprubio closed this Feb 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants