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.

Sign up for GitHub

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

Jump to bottom

on region_errors.rs #100900

Merged
merged 1 commit into from
Aug 27, 2022
Merged

on region_errors.rs #100900

merged 1 commit into from
Aug 27, 2022

Conversation

AndyJado
Copy link
Contributor

@rustbot label +A-translation

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 23, 2022
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jackh726 (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 23, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@AndyJado AndyJado marked this pull request as ready for review August 23, 2022 10:55
@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2022

rustc_error_messages was changed

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

@AndyJado
Copy link
Contributor Author

sorry about the mess..but

r?

@davidtwco
Copy link
Member

r? @davidtwco

@rust-highfive rust-highfive assigned davidtwco and unassigned jackh726 Aug 23, 2022
@davidtwco
Copy link
Member

You'll need to remove the merge commits, we've got a no merge policy :)

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-rustdoc-json Area: Rustdoc JSON backend labels Aug 23, 2022
@AndyJado AndyJado force-pushed the diag-migrate branch 2 times, most recently from 2aa9e24 to c03694a Compare August 23, 2022 11:14
@davidtwco
Copy link
Member

I think you've removed the merge commit incorrectly - there are a lot of changes in this pull request now.

@davidtwco davidtwco mentioned this pull request Aug 23, 2022
Open
84 tasks
@AndyJado
Copy link
Contributor Author

I'll manage to fix it first thing in the morning!

davidtwco
davidtwco requested changes Aug 24, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

This looks great, I've left a couple comments

compiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated Show resolved Hide resolved
@davidtwco davidtwco 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-review Status: Awaiting review from the assignee but also interested parties. A-rustdoc-json Area: Rustdoc JSON backend labels Aug 24, 2022
@davidtwco davidtwco removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Aug 24, 2022
@davidtwco
Copy link
Member

Use @rustbot ready when you've addressed the comments :)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@AndyJado
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 24, 2022
davidtwco
davidtwco reviewed Aug 24, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

I think this is ready after this last comment is resolved, thanks for your work on this.

compiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated Show resolved Hide resolved
davidtwco
davidtwco reviewed Aug 25, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Okay, I know that I said that the previous comment was the last one, but I've got one more suggestion - thanks for sticking with this. :)

compiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated Show resolved Hide resolved
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 26, 2022

📌 Commit 622217d 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 Aug 26, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 26, 2022
@Dylan-DPC
Rollup merge of rust-lang#100900 - AndyJado:diag-migrate, r=davidtwco
5fea6a0 
on `region_errors.rs`

`@rustbot` label +A-translation
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 26, 2022
Closed
@compiler-errors
Copy link
Member

@bors rollup=always

@compiler-errors compiler-errors mentioned this pull request Aug 26, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2022
@bors
Auto merge of rust-lang#101064 - compiler-errors:rollup-fwm5m5f, r=co…
bb8a08f 
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#100724 (Migrate ast lowering to session diagnostic)
 - rust-lang#100735 (Migrate `rustc_ty_utils` to `SessionDiagnostic`)
 - rust-lang#100738 (Diagnostics migr const eval)
 - rust-lang#100744 (Migrate rustc_mir_dataflow to diagnostic structs)
 - rust-lang#100776 (Migrate `rustc_lint` errors to `SessionDiagnostic`)
 - rust-lang#100817 (sugg: suggest the usage of boolean value when there is a typo in the keyword)
 - rust-lang#100836 (Migrate `rustc_attr` crate diagnostics)
 - rust-lang#100890 (Migrate rustc_driver to SessionDiagnostic)
 - rust-lang#100900 (on `region_errors.rs`)

Failed merges:

 - rust-lang#100831 (Migrate `symbol_mangling` module to new diagnostics structs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 96ceadd into rust-lang:master Aug 27, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

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

Successfully merging this pull request may close these issues.
8 participants
@AndyJado @rust-highfive @rust-log-analyzer @rustbot @davidtwco @bors @compiler-errors @jackh726