ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow#87069
Merged
bors merged 5 commits intorust-lang:masterfrom Jul 16, 2021
Merged
ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow#87069bors merged 5 commits intorust-lang:masterfrom
bors merged 5 commits intorust-lang:masterfrom
Conversation
nikomatsakis
requested changes
Jul 12, 2021
| match mode { | ||
| ConsumeMode::Move => self.delegate.consume(place_with_id, diag_expr_id, mode), | ||
| ConsumeMode::Copy => { | ||
| self.delegate.borrow(place_with_id, diag_expr_id, ty::BorrowKind::ImmBorrow) |
Contributor
There was a problem hiding this comment.
Hmm, I had expected to make this change within the upvar delegate, and not the ExprUseVisitor. It seems potentially useful to some clients to know that this was a "by-value copy" -- I think there is other code in clippy that uses this, for example.
Contributor
There was a problem hiding this comment.
Otherwise we should just remove the ConsumeMode
nikomatsakis
requested changes
Jul 14, 2021
Contributor
nikomatsakis
left a comment
There was a problem hiding this comment.
Suggested edit to the comment, and a simplification
Comment on lines
+29
to
35
| // The value found at `place` is moved, depending | ||
| // on `mode`. Where `diag_expr_id` is the id used for diagnostics for `place`. | ||
| // | ||
| // The parameter `diag_expr_id` indicates the HIR id that ought to be used for | ||
| // diagnostics. Around pattern matching such as `let pat = expr`, the diagnostic | ||
| // id will be the id of the expression `expr` but the place itself will have | ||
| // the id of the binding in the pattern `pat`. |
Contributor
There was a problem hiding this comment.
Suggested change
| // The value found at `place` is moved, depending | |
| // on `mode`. Where `diag_expr_id` is the id used for diagnostics for `place`. | |
| // | |
| // The parameter `diag_expr_id` indicates the HIR id that ought to be used for | |
| // diagnostics. Around pattern matching such as `let pat = expr`, the diagnostic | |
| // id will be the id of the expression `expr` but the place itself will have | |
| // the id of the binding in the pattern `pat`. | |
| // The value found at `place` is moved, meaning that it is used by value | |
| // and is not known to have `Copy` type. | |
| // | |
| // If a value is used by value but *does* have `Copy` type, that is treated as a | |
| // "shared borrow". This corresponds to the minimal access that a closure needs | |
| // to perform that operation (a shared reference). | |
| // | |
| // The parameter `diag_expr_id` indicates the HIR id that ought to be used for | |
| // diagnostics. Around pattern matching such as `let pat = expr`, the diagnostic | |
| // id will be the id of the expression `expr` but the place itself will have | |
| // the id of the binding in the pattern `pat`. |
Contributor
Author
There was a problem hiding this comment.
I didn't add the detail about closures because ExprUseVisitor and therefore this delegate is used in other contexts too
Comment on lines
+656
to
+664
| let mode = copy_or_move(mc, &place); | ||
| match mode { | ||
| ConsumeMode::Move => delegate.consume(place, discr_place.hir_id), | ||
| ConsumeMode::Copy => delegate.borrow( | ||
| place, | ||
| discr_place.hir_id, | ||
| ty::BorrowKind::ImmBorrow, | ||
| ), | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| let mode = copy_or_move(mc, &place); | |
| match mode { | |
| ConsumeMode::Move => delegate.consume(place, discr_place.hir_id), | |
| ConsumeMode::Copy => delegate.borrow( | |
| place, | |
| discr_place.hir_id, | |
| ty::BorrowKind::ImmBorrow, | |
| ), | |
| } | |
| self.delegate_consume(place, discr_place.hir_id); |
Does this not work?
Contributor
Author
There was a problem hiding this comment.
we need 2229 enabled to make this work 🙃. The closure is passed to self.mc. I'll just refactor into a helper.
63c5900 to
c4ac836
Compare
nikomatsakis
requested changes
Jul 15, 2021
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 75291ee has been approved by |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jul 15, 2021
…matsakis ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow r? `@nikomatsakis`
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jul 15, 2021
…matsakis ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow r? ``@nikomatsakis``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 16, 2021
…laumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#86983 (Add or improve natvis definitions for common standard library types) - rust-lang#87069 (ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow) - rust-lang#87138 (Correct invariant documentation for `steps_between`) - rust-lang#87145 (Make --cap-lints and related options leave crate hash alone) - rust-lang#87161 (RFC2229: Use the correct place type) - rust-lang#87162 (Fix type decl layout "overflow") - rust-lang#87167 (Fix sidebar display on small devices) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jul 19, 2021
…matsakis ExprUseVisitor: Treat ByValue use of Copy types as ImmBorrow r? ```@nikomatsakis```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
r? @nikomatsakis