[NLL] Improve "borrow later used here" messages #54666
Conversation
rust-highfive
added
the
S-waiting-on-review
|
The "borrow later used by call" messages look much better now! |
| @@ -298,9 +300,9 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> { | |||
| "immutable", | |||
| "mutable", | |||
| ) { | |||
| (BorrowKind::Shared, lft, _, BorrowKind::Mut { .. }, _, rgt) | |||
| | (BorrowKind::Mut { .. }, _, lft, BorrowKind::Shared, rgt, _) => tcx | |||
There was a problem hiding this comment.
hmm. If my memory is right, the reason this was structured as a match on a tuple was to allow collapsing multiple cases like these and selecting the right string to use by setting lft and rgt to the appropriate string literal from the match input.
Reading over the code now, I am thinking that there is potentially no longer any instance of two arms being collapsed, which means we really should consider cleaning up the code by getting rid of those string literals in the tuple (and instead just pass the appropriate strings below), I think...
That cleanup doesn't have to be part of this PR, though.
| @@ -68,7 +84,7 @@ impl<'tcx> BorrowExplanation<'tcx> { | |||
| BorrowExplanation::MustBeValidFor(region) => { | |||
| tcx.note_and_explain_free_region( | |||
| err, | |||
| "borrowed value must be valid for ", | |||
| &(borrow_desc + "borrowed value must be valid for "), | |||
There was a problem hiding this comment.
whoa, I barely ever see string concatenation via + in Rust code I read...
|
@bors r+ |
|
📌 Commit d18177c34b048feb00814bee5bdbf8d53e665aab has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #54343) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
Once this gets rebased it should be given a high priority to avoid more merge conflicts. |
Give a special message when the later use is from a call. Use the span of the callee instead of the whole expression. For conflicting borrow messages say that the later use is of the first borrow.
matthewjasper
force-pushed
the
mir-function-spans
branch
from
d18177c to
bc4f9b8
Compare
|
@bors r=pnkfelix |
|
📌 Commit bc4f9b8 has been approved by |
bors
added
S-waiting-on-bors
[NLL] Improve "borrow later used here" messages * In the case of two conflicting borrows, the later used message says which borrow it's referring to * If the later use is a function call (from the users point of view) say that the later use is for the call. Point just to the function. r? @pnkfelix Closes #48643
|
☀️ Test successful - status-appveyor, status-travis |
r? @pnkfelix
Closes #48643