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.

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

Suggest struct when we get colon in fileds in enum #111118

Merged
merged 2 commits into from
May 8, 2023

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented May 3, 2023

A follow-up fix for #109128

From: #109128 (comment)

r? @estebank

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 3, 2023
@bors
Copy link
Contributor

bors commented May 4, 2023

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

@compiler-errors
Copy link
Member

r? @compiler-errors @bors r+

@bors
Copy link
Contributor

bors commented May 8, 2023

📌 Commit 0e8703d has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned estebank May 8, 2023
@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 May 8, 2023
@compiler-errors
Copy link
Member

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2023
…mpiler-errors

Rollup of 6 pull requests

Successful merges:

 - rust-lang#104070 (Prevent aborting guard from aborting the process in a forced unwind)
 - rust-lang#109410 (Introduce `AliasKind::Inherent` for inherent associated types)
 - rust-lang#111004 (Migrate `mir_transform` to translatable diagnostics)
 - rust-lang#111118 (Suggest struct when we get colon in fileds in enum)
 - rust-lang#111170 (Diagnostic args are still args if they're documented)
 - rust-lang#111354 (Fix miscompilation when calling default methods on `Future`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit beb4967 into rust-lang:master May 8, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants