Skip to content

Add suggestion to use closure argument instead of a capture on borrowck error - #110061

Merged
bors merged 5 commits into
rust-lang:masterfrom
WaffleLapkin:duality_of_myself_and_this
Apr 20, 2023
Merged

Add suggestion to use closure argument instead of a capture on borrowck error#110061
bors merged 5 commits into
rust-lang:masterfrom
WaffleLapkin:duality_of_myself_and_this

Conversation

@WaffleLapkin

@WaffleLapkinWaffleLapkin commented Apr 7, 2023

Copy link
Copy Markdown
Member

Fixes#109271
r? @compiler-errors

This should probably be refined a bit, but opening a PR so that I don't forget anything.

@rustbotrustbot 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 Apr 7, 2023
@WaffleLapkinWaffleLapkin 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. labels Apr 7, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@WaffleLapkinWaffleLapkin added A-diagnostics Area: Messages for errors, warnings, and lints A-closures Area: Closures (`|…| { … }`) A-borrow-checker Area: The borrow checker labels Apr 7, 2023
@WaffleLapkin

WaffleLapkin commented Apr 12, 2023

Copy link
Copy Markdown
MemberAuthor

@rustbot ready

@rustbotrustbot 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 Apr 12, 2023
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from ea6fc6c to 0c8ebc9CompareApril 12, 2023 17:35
cjgillot
cjgillot reviewed Apr 12, 2023
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
Comment threadcompiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
Comment threadcompiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
Comment threadcompiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
Comment threadcompiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Apr 16, 2023

Copy link
Copy Markdown
Collaborator

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

@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from 385d50c to e1b56cbCompareApril 17, 2023 14:21
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from d814747 to 8c4596dCompareApril 17, 2023 16:54
@bors

bors commented Apr 17, 2023

Copy link
Copy Markdown
Collaborator

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

@compiler-errors

compiler-errors commented Apr 19, 2023

Copy link
Copy Markdown
Contributor

r? @cjgillot

@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from 8c4596d to b47cd78CompareApril 19, 2023 11:04
@cjgillot

cjgillot commented Apr 19, 2023

Copy link
Copy Markdown
Contributor

r=me with review commits squashed into main commits

@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from b47cd78 to 4daa932CompareApril 19, 2023 19:05
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from 4daa932 to 5d41a46CompareApril 19, 2023 19:07
@WaffleLapkin
Remove useless check (drive-by cleanup)
ceabcd8
While it might *seem* that this does something, it actually doesn't.
`mut_borrow_of_mutable_ref` returns a `bool` that is ignored by the
let-else. This was basically
```rust
if !self.body.local_decls.get(local).is_some() {
return
}
```
Which is pretty useless
@WaffleLapkin
Add #[track_caller] to struct_span_err_with_code (drive-by cleanup)
cfe5c3c
We use caller information to track where a diagnostic was created,
so all "helper" diagnostic functions should use `#[track_caller]`
@WaffleLapkin
Add suggestion to use a closure arg instead of a capture on bck error
102c0af
@WaffleLapkin
Extend and use hir::Node::body_id
cac143f
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the duality_of_myself_and_this branch from 5d41a46 to cac143fCompareApril 19, 2023 19:21
@WaffleLapkin

WaffleLapkin commented Apr 19, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r=cjgillot

I've cleaned-up the git history

@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit cac143f has been approved by cjgillot

It is now in the queue for this repository.

@borsbors 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 19, 2023
@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cac143f with merge b9fd498...

@bors

bors commented Apr 20, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing b9fd498 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 20, 2023
@bors
bors merged commit b9fd498 into rust-lang:masterApr 20, 2023
@rustbotrustbot added this to the 1.71.0 milestone Apr 20, 2023
@rust-timer

rust-timer commented Apr 20, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (b9fd498): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)		3.8%[3.8%, 3.8%]1
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-3.5%[-3.5%, -3.5%]1
All ❌✅ (primary)3.8%[3.8%, 3.8%]1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.2%[2.0%, 2.5%]2
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)--0

@WaffleLapkin
WaffleLapkin deleted the duality_of_myself_and_this branch April 20, 2023 12:06
@matthiaskrgrmatthiaskrgr mentioned this pull request Apr 28, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjgillotcjgillotcjgillot left review comments

Assignees

@cjgillotcjgillot

Labels

A-borrow-checkerArea: The borrow checkerA-closuresArea: Closures (`|…| { … }`)A-diagnosticsArea: Messages for errors, warnings, and lintsmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.

Detect unused "passing self into closure" pattern to side-step borrow checker

7 participants

@WaffleLapkin@rust-log-analyzer@bors@compiler-errors@cjgillot@rust-timer@rustbot