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

Update closure capture error logging for disjoint captures for disjoint captures #84358

Merged
merged 6 commits into from
May 2, 2021
Merged

Update closure capture error logging for disjoint captures for disjoint captures #84358

merged 6 commits into from
May 2, 2021

Conversation

ChrisPardy
Copy link
Member

@ChrisPardy ChrisPardy commented Apr 20, 2021 •
edited
Loading

Improved error logging when #![feature(capture_disjoint_fields)] is used.

Closes rust-lang/project-rfc-2229#8
Closes rust-lang/project-rfc-2229#36
Closes rust-lang/project-rfc-2229#39
Closes #76005

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 20, 2021
@ChrisPardy
Copy link
Member Author

r? @nikomatsakis

nikomatsakis
nikomatsakis requested changes Apr 20, 2021
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis 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 pretty good! Let a few nits, but r=me once fixed.

compiler/rustc_mir/src/borrow_check/diagnostics/region_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/mir/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_mir/src/borrow_check/diagnostics/explain_borrow.rs Outdated Show resolved Hide resolved
compiler/rustc_mir/src/borrow_check/diagnostics/explain_borrow.rs Outdated Show resolved Hide resolved
compiler/rustc_mir/src/borrow_check/diagnostics/explain_borrow.rs Outdated Show resolved Hide resolved
compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs Show resolved Hide resolved
@nikomatsakis
Copy link
Contributor

@bors delegate+

@bors
Copy link
Contributor

bors commented Apr 20, 2021

✌️ @ChrisPardy can now approve this pull request

@arora-aman
Copy link
Member

Closes #76005 aswell

@ChrisPardy
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 30, 2021

📌 Commit c3da321e55dce55d2081abc9ada4bf56837a4cf8 has been approved by nikomatsakis

@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 Apr 30, 2021
@bors
Copy link
Contributor

bors commented Apr 30, 2021

⌛ Testing commit c3da321e55dce55d2081abc9ada4bf56837a4cf8 with merge 2c5be70da85cb08c621b6cd48f9b23e508020f97...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 30, 2021

💔 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 Apr 30, 2021
@ChrisPardy ChrisPardy force-pushed the print_captures_borrowck_rebased branch from c3da321 to d19c468 Compare May 2, 2021 00:11
@ChrisPardy
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented May 2, 2021

📌 Commit d19c468 has been approved by nikomatsakis

@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 May 2, 2021
@bors
Copy link
Contributor

bors commented May 2, 2021

⌛ Testing commit d19c468 with merge a134ad75469a2d429c6383baabcada8f44913c69...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 2, 2021

💔 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 May 2, 2021
@ChrisPardy
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented May 2, 2021

📌 Commit 404cc33 has been approved by nikomatsakis

@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 May 2, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 2, 2021
@Dylan-DPC
Rollup merge of rust-lang#84358 - sexxi-goose:print_captures_borrowck…
35c6902 
…_rebased, r=nikomatsakis

Update closure capture error logging for disjoint captures for disjoint captures

Improved error logging when `#![feature(capture_disjoint_fields)]` is used.

Closes rust-lang/project-rfc-2229#8
Closes rust-lang/project-rfc-2229#36
Closes rust-lang/project-rfc-2229#39
Closes rust-lang#76005
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 2, 2021
Closed
@bors
Copy link
Contributor

bors commented May 2, 2021

⌛ Testing commit 404cc33 with merge 67721110c86aa2bc57588bd21b19401c78228f9c...

@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 2, 2021
Merged
@Dylan-DPC-zz
Copy link

@bors retry yield

bors added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2021
@bors
Auto merge of rust-lang#84822 - Dylan-DPC:rollup-wego8d6, r=Dylan-DPC
e10cbc3 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#84358 (Update closure capture error logging for disjoint captures for disjoint captures)
 - rust-lang#84392 (Make AssertKind::fmt_assert_args public)
 - rust-lang#84752 (Fix debuginfo for generators)
 - rust-lang#84763 (shrink doctree::Module)
 - rust-lang#84821 (Fix nit in rustc_session::options)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors bors merged commit a00edce into rust-lang:master May 2, 2021
@bors
Copy link
Contributor

bors commented May 2, 2021

⌛ Testing commit 404cc33 with merge e10cbc3...

@rustbot rustbot added this to the 1.54.0 milestone May 2, 2021
@m-ou-se m-ou-se mentioned this pull request Sep 3, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis requested changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.54.0
9 participants
@ChrisPardy @rust-highfive @nikomatsakis @bors @arora-aman @rust-log-analyzer @Dylan-DPC-zz @davidtwco @rustbot