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

Detect actual span for getting unexpected token from parsing macros #112518

Merged
merged 1 commit into from
Jun 27, 2023

Conversation

chenyukang
Copy link
Member

Fixes #112458

@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2023

r? @davidtwco

(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 Jun 11, 2023
@Nilstrieb
Copy link
Member

fn main() {
    println!("{}", x-);
}

errors with

error: expected expression, found end of macro arguments
 --> src/main.rs:2:22
  |
2 |     println!("{}", x-); //~ ERROR unexpected token: `)`
  |                      ^ expected expression

which looks very nice. I would prefer it if the error here hooked into the same logic instead of trying to duplicate it

@chenyukang
Copy link
Member Author

fn main() {
    println!("{}", x-);
}

errors with

error: expected expression, found end of macro arguments
 --> src/main.rs:2:22
  |
2 |     println!("{}", x-); //~ ERROR unexpected token: `)`
  |                      ^ expected expression

which looks very nice. I would prefer it if the error here hooked into the same logic instead of trying to duplicate it

expected_expression_found generates this error, but there are some different scenarios for error_unexpected_after_dot.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2023

📌 Commit 0220c0b has been approved by davidtwco

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 Jun 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112518 (Detect actual span for getting unexpected token from parsing macros)
 - rust-lang#112978 (Add suggestion for bad block fragment error)
 - rust-lang#113068 (bootstrap: rename 'user' profile to 'dist')
 - rust-lang#113079 (Use `CoverageKind::as_operand_id` instead of manually reimplementing it)
 - rust-lang#113089 (Export AnalysisResults trait in rustc_mir_dataflow)
 - rust-lang#113093 (`thir`: Add `Become` expression kind)
 - rust-lang#113096 (Remove unused struct and tweak format macro uses)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9f2c21c into rust-lang:master Jun 27, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
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.

unexpected token: <eof> although it's not eof, but eoi
5 participants