Skip to content

Fix the issue of wrong diagnosis for extern pub fn #113350

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 6, 2023
Merged

Fix the issue of wrong diagnosis for extern pub fn #113350

merged 1 commit into from
Jul 6, 2023

Conversation

chenyukang
Copy link
Member

Fixes #113342

@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2023

r? @compiler-errors

(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 Jul 5, 2023
compiler-errors
compiler-errors reviewed Jul 5, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment •
edited
Loading

Choose a reason for hiding this comment

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

r=me after fixing the comment and squashing it into one commit

compiler/rustc_parse/src/parser/item.rs Outdated
&& self.look_ahead(2, |t| t.is_keyword_case(kw::Fn, case))
&& (self.look_ahead(2, |t| t.is_keyword_case(kw::Fn, case)) ||
// only for better diagnostic in later, `pub` is not allowed here
(self.look_ahead(2, |t| t.is_keyword(kw::Pub)) &&
Copy link
Member

Choose a reason for hiding this comment

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

This is a recovery so it should probably be gated behind Parser::may_recover.

@chenyukang chenyukang force-pushed the yukang-fix-113342-parser branch from 2b626ba to f25463e Compare July 5, 2023 08:26
@chenyukang
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Jul 5, 2023

📌 Commit f25463e has been approved by compiler-errors

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 Jul 5, 2023
@fee1-dead fee1-dead mentioned this pull request Jul 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2023
@bors
Auto merge of rust-lang#113391 - fee1-dead-contrib:rollup-9bqlw9z, r=…
0d50ab7 
…fee1-dead

Rollup of 9 pull requests

Successful merges:

 - rust-lang#111119 (style-guide: Add chapter about formatting for nightly-only syntax)
 - rust-lang#112791 (llvm ffi: Expose `CallInst->setTailCallKind`)
 - rust-lang#113145 (style-guide: Document newline rules for assignment operators)
 - rust-lang#113163 (Add a regression test for rust-lang#112895)
 - rust-lang#113332 (resolve: Use `Interned` for some interned structures)
 - rust-lang#113334 (Revert the lexing of `c"…"` string literals)
 - rust-lang#113350 (Fix the issue of wrong diagnosis for extern pub fn)
 - rust-lang#113371 (Fix submodule handling when the current branch is named after a tag)
 - rust-lang#113384 (style-guide: Clarify grammar for small patterns (not a semantic change))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2bc0ae3 into rust-lang:master Jul 6, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 6, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@compiler-errors compiler-errors

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
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

Wrong diagnosis for extern "C" pub fn name() {}
4 participants
@chenyukang @rustbot @bors @compiler-errors