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

Give a helpful diagnostic when the next struct field has an attribute #100475

Merged
merged 1 commit into from
Aug 14, 2022

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Aug 13, 2022

Fixes #100461

@rust-highfive
Copy link
Collaborator

r? @fee1-dead

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

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 13, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2022
@compiler-errors
Copy link
Member

compiler-errors commented Aug 13, 2022

@chenyukang you need to write "fix" or "fixes" in the description to link it to an issue, "fixing" doesn't work 😅 I edited it.

@chenyukang
Copy link
Member Author

chenyukang commented Aug 13, 2022

@chenyukang you need to write "fix" or "fixes" in the description to link it to an issue, "fixing" doesn't work 😅 I edited it.

Thanks!

@fee1-dead
Copy link
Member

LGTM! Thanks

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 13, 2022

📌 Commit 52a1518 has been approved by fee1-dead

It is now in the queue for this repository.

@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 Aug 13, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 14, 2022
…mpiler-errors

Rollup of 11 pull requests

Successful merges:

 - rust-lang#100355 (rustdoc: Rename ``@has` FILE PATTERN` to ``@hasraw` FILE PATTERN`)
 - rust-lang#100407 (avoid some int2ptr casts in thread_local_key tests)
 - rust-lang#100434 (Fix HIR pretty printing of let else)
 - rust-lang#100438 (Erase regions better in `promote_candidate`)
 - rust-lang#100445 (adapt test for msan message change)
 - rust-lang#100447 (Remove more Clean trait implementations)
 - rust-lang#100464 (Make `[rust] use-lld=true` work on windows)
 - rust-lang#100475 (Give a helpful diagnostic when the next struct field has an attribute)
 - rust-lang#100490 (wf: correctly `shallow_resolve` consts)
 - rust-lang#100501 (nicer Miri backtraces for from_exposed_addr)
 - rust-lang#100509 (merge two test directories that mean the same thing)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 29f905b into rust-lang:master Aug 14, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 14, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Attributes following a missing trailing comma produce over-eager recovery
6 participants