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

Migrate some of rustc_parse to derive diagnostics #107446

Merged
merged 1 commit into from
Feb 9, 2023

Conversation

clubby789
Copy link
Contributor

@rustbot label +A-translation
r? rust-lang/diagnostics
cc #100717

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Jan 29, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 29, 2023

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@rust-log-analyzer

This comment has been minimized.

@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from 3815394 to 9441e34 Compare January 29, 2023 15:40
@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from 9441e34 to 109d428 Compare January 29, 2023 15:43
@rust-log-analyzer

This comment has been minimized.

@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch 3 times, most recently from 721b3e1 to 9eb41a5 Compare January 29, 2023 21:01
@rust-log-analyzer

This comment has been minimized.

@clubby789 clubby789 marked this pull request as draft January 29, 2023 22:13
@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch 2 times, most recently from d157ee2 to 9eb41a5 Compare January 29, 2023 22:19
@rust-log-analyzer

This comment has been minimized.

@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from 9eb41a5 to cd0513a Compare January 29, 2023 22:50
@estebank
Copy link
Contributor

r? rust-lang/diagnostics

I'll be out for the next two weeks.

@rustbot rustbot assigned compiler-errors and unassigned estebank Jan 30, 2023
@clubby789
Copy link
Contributor Author

Planning to migrate the EscapeError::MoreThanOneChar in uescape_error_reporting before I mark this as ready, although having some trouble mapping the current diagnostic

@compiler-errors
Copy link
Member

@clubby789 up to you how you want the PR to be reviewed, but feel free to work on this in parts. I can review this now, and then review other more challenging diagnostics later in folow-up PRs.

@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from cd0513a to eeba674 Compare January 31, 2023 01:32
@clubby789
Copy link
Contributor Author

clubby789 commented Jan 31, 2023

@rustbot ready Oops, forgot to mark as author originally 😅

@clubby789 clubby789 marked this pull request as ready for review January 31, 2023 01:35
@clubby789
Copy link
Contributor Author

@mejrs pointed out that this has some overlap with #105670, so this PR should probably be merged after that to avoid it being conflicted again

@bors
Copy link
Contributor

bors commented Feb 2, 2023

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

@compiler-errors
Copy link
Member

Gonna mark this as waiting-on-author then.

@rustbot author

@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from 8f8a4e1 to 123cda9 Compare February 5, 2023 16:18
@compiler-errors
Copy link
Member

r=me once rebased (use @bors r=compiler-errors)

@bors delegate+

@bors
Copy link
Contributor

bors commented Feb 6, 2023

📌 Commit 123cda9ba4af9c23b05ced73669944c63877fb3d 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 Feb 6, 2023
@bors
Copy link
Contributor

bors commented Feb 6, 2023

✌️ @clubby789 can now approve this pull request

@compiler-errors
Copy link
Member

Ugh, @bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 6, 2023
@clubby789 clubby789 force-pushed the rustc-parse-diag-migrate branch from 123cda9 to 521c5f3 Compare February 6, 2023 14:40
@clubby789
Copy link
Contributor Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Feb 6, 2023

📌 Commit 521c5f3 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 6, 2023
@bors
Copy link
Contributor

bors commented Feb 7, 2023

⌛ Testing commit 521c5f3 with merge 76d431021cdc6c4bbd27b6794a02d8a108fb31b4...

@bors
Copy link
Contributor

bors commented Feb 7, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 7, 2023
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      OS Loader Version: 540.120.3~22
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMSLpWyMkKFG
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234

@clubby789
Copy link
Contributor Author

Looks like network issue on CI

@compiler-errors
Copy link
Member

@bors retry

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

Rollup of 5 pull requests

Successful merges:

 - rust-lang#107446 (Migrate some of `rustc_parse` to derive diagnostics)
 - rust-lang#107752 (Specify dlltool prefix when generating import libs)
 - rust-lang#107808 (bootstrap.py: fix build-failure message)
 - rust-lang#107834 (create symlink for legacy rustfmt path)
 - rust-lang#107835 (use idiomatic formatting)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3b9543c into rust-lang:master Feb 9, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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.

7 participants