4d66986e09
Currently, we use a relatively 'small' span for THIR
expressions generated by an 'adjustment' (e.g. an autoderef,
autoborrow, unsizing). As a result, if a borrow generated
by an adustment ends up causing a borrowcheck error, for example:
```rust
let mut my_var = String::new();
let my_ref = &my_var
my_var.push('a');
my_ref;
```
then the span for the mutable borrow may end up referring
to only the base expression (e.g. `my_var`), rather than
the method call which triggered the mutable borrow
(e.g. `my_var.push('a')`)
Due to a quirk of the MIR borrowck implementation,
this doesn't always get exposed in migration mode,
but it does in many cases.
This commit makes THIR building consistently use 'larger'
spans for adjustment expressions
The intent of this change it make it clearer to users
when it's the specific way in which a variable is
used (for example, in a method call) that produdes
a borrowcheck error. For example, an error message
claiming that a 'mutable borrow occurs here' might
be confusing if it just points at a usage of a variable
(e.g. `my_var`), when no `&mut` is in sight. Pointing
at the entire expression should help to emphasize
that the method call itself is responsible for
the mutable borrow.
In several cases, this makes the `#![feature(nll)]` diagnostic
output match up exactly with the default (migration mode) output.
As a result, several `.nll.stderr` files end up getting removed
entirely.
35 lines
1.1 KiB
Plaintext
35 lines
1.1 KiB
Plaintext
error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
|
|
--> $DIR/issue-21600.rs:14:20
|
|
|
|
|
LL | fn call_it<F>(f: F) where F: Fn() { f(); }
|
|
| - change this to accept `FnMut` instead of `Fn`
|
|
...
|
|
LL | call_it(|| x.gen_mut());
|
|
| ------- ^^^^^^^^^^^ cannot borrow as mutable
|
|
| |
|
|
| expects `Fn` instead of `FnMut`
|
|
|
|
error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
|
|
--> $DIR/issue-21600.rs:14:17
|
|
|
|
|
LL | fn call_it<F>(f: F) where F: Fn() { f(); }
|
|
| - change this to accept `FnMut` instead of `Fn`
|
|
...
|
|
LL | call_it(|| {
|
|
| _____-------_-
|
|
| | |
|
|
| | expects `Fn` instead of `FnMut`
|
|
LL | | call_it(|| x.gen());
|
|
LL | | call_it(|| x.gen_mut());
|
|
| | ^^ - mutable borrow occurs due to use of `x` in closure
|
|
| | |
|
|
| | cannot borrow as mutable
|
|
LL | |
|
|
LL | |
|
|
LL | | });
|
|
| |_____- in this closure
|
|
|
|
error: aborting due to 2 previous errors
|
|
|
|
For more information about this error, try `rustc --explain E0596`.
|