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

Recover from incorrectly ordered/duplicated function keywords #117282

Merged
merged 1 commit into from Nov 8, 2023

Conversation

clubby789
Copy link
Contributor

Fixes #115714

@rustbot
Copy link
Collaborator

rustbot commented Oct 27, 2023

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 27, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the recover-wrong-function-header branch from b769520 to 82644aa Compare October 27, 2023 13:31
@rust-log-analyzer

This comment has been minimized.

@rust-cloud-vms rust-cloud-vms bot force-pushed the recover-wrong-function-header branch from 82644aa to be0b42f Compare October 27, 2023 18:29
Comment on lines -4 to -13
LL | impl S {
| - while parsing this item list starting here
LL | #[cfg(FALSE)]
LL | unsafe async fn g() {}
| -------^^^^^
| | |
| | expected one of `extern` or `fn`
| help: `async` must come before `unsafe`: `async unsafe`
LL | }
| - the item list ends here
Copy link
Member

Choose a reason for hiding this comment

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

Ideally, I think it's best to leave this as it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, this message indicates that it wasn't able to recover the rest of the item list if I understand right? I think this is an improvement as it's able to continue parsing other items in the list, so the message isn't really necessary

@TaKO8Ki
Copy link
Member

TaKO8Ki commented Nov 8, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 8, 2023

📌 Commit be0b42f has been approved by TaKO8Ki

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 Nov 8, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2023
…eader, r=TaKO8Ki

Recover from incorrectly ordered/duplicated function keywords

Fixes rust-lang#115714
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2023
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#117263 (handle the case when the change-id isn't found)
 - rust-lang#117282 (Recover from incorrectly ordered/duplicated function keywords)
 - rust-lang#117679 (tests/rustdoc-json: Avoid needless use of `no_core` and `lang_items`)
 - rust-lang#117702 (target: move base and target specifications)
 - rust-lang#117713 (Add test for reexported hidden item with `--document-hidden-items`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c828371 into rust-lang:master Nov 8, 2023
11 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 8, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2023
Rollup merge of rust-lang#117282 - clubby789:recover-wrong-function-header, r=TaKO8Ki

Recover from incorrectly ordered/duplicated function keywords

Fixes rust-lang#115714
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.

unsafe const fn should recover-parse as const unsafe fn
5 participants