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 rustc_borrowck diagnostics to SessionDiagnostic #98415

Merged

Conversation

compiler-errors
Copy link
Member

Self-explanatory

r? @davidtwco

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 23, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2022
@@ -10,7 +10,7 @@ LL | | .into_iter()
LL | | .map(|elem| elem.to_string())
| |_____________________________________^
|
= note: could not prove for<'r> [closure@$DIR/issue-71546.rs:14:14: 14:37] well-formed
= note: could not prove `for<'r> [closure@$DIR/issue-71546.rs:14:14: 14:37] well-formed`
Copy link
Member Author

Choose a reason for hiding this comment

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

The Display impl for Predicate means that we either put ticks around this or we don't put ticks around "could not prove Ty: Trait" -- I prefer the backticks around all predicates.

We could perhaps also avoid this by having Predicate have a smarter Display impl, or maybe having a special IntoDiagnosticArg for Predicate.

Copy link
Member

Choose a reason for hiding this comment

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

It's a little unfortunate that "well-formed" is also in the backticks but I think this is probably fine for now.

@davidtwco
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 23, 2022

📌 Commit 621811447b06188833bf81f88dd9c5b1eba4b95e has been approved by davidtwco

@bors
Copy link
Contributor

bors commented Jun 23, 2022

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

@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 23, 2022
@compiler-errors
Copy link
Member Author

@bors r- failed to merge apparently

@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 Jun 23, 2022
@bors
Copy link
Contributor

bors commented Jun 24, 2022

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

@compiler-errors compiler-errors force-pushed the rustc-borrowck-session-diagnostic-1 branch from 6218114 to 98af1bf Compare June 28, 2022 22:42
@compiler-errors
Copy link
Member Author

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Jun 28, 2022

📌 Commit 98af1bf has been approved by davidtwco

@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 Jun 28, 2022
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 29, 2022
…ion-diagnostic-1, r=davidtwco

Migrate some `rustc_borrowck` diagnostics to `SessionDiagnostic`

Self-explanatory

r? `@davidtwco`
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 29, 2022
…ion-diagnostic-1, r=davidtwco

Migrate some `rustc_borrowck` diagnostics to `SessionDiagnostic`

Self-explanatory

r? ``@davidtwco``
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#98415 (Migrate some `rustc_borrowck` diagnostics to `SessionDiagnostic`)
 - rust-lang#98479 (Add `fetch_not` method on `AtomicBool`)
 - rust-lang#98499 (Erase regions in New Abstract Consts)
 - rust-lang#98516 (library: fix uefi va_list type definition)
 - rust-lang#98554 (Fix box with custom allocator in miri)
 - rust-lang#98607 (Clean up arg mismatch diagnostic, generalize tuple wrap suggestion)
 - rust-lang#98625 (emit Retag for compound types with reference fields)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d10497b into rust-lang:master Jun 29, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 29, 2022
@davidtwco davidtwco added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Aug 17, 2022
@compiler-errors compiler-errors deleted the rustc-borrowck-session-diagnostic-1 branch August 11, 2023 20:18
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.

5 participants