Skip to content

Commit a0e7e35

Browse files
mikhail-m1mikhail-m1
committed
Improve "Doesn't live long enough" error
case with different lifetime with spans
1 parent 69ec350 commit a0e7e35

29 files changed

+309
-6
lines changed

‎src/librustc_borrowck/borrowck/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,19 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
10641064
db.note("values in a scope are dropped in the opposite order \
10651065
they are created");
10661066
}
1067+
(Some(s1), Some(s2)) if !is_temporary && !is_closure => {
1068+
db.span = MultiSpan::from_span(s2);
1069+
db.span_label(error_span, &format!("borrow occurs here"));
1070+
let msg = match opt_loan_path(&err.cmt) {
1071+
None => "borrowed value".to_string(),
1072+
Some(lp) => {
1073+
format!("`{}`", self.loan_path_to_string(&lp))
1074+
}
1075+
};
1076+
db.span_label(s2,
1077+
&format!("{} dropped here while still borrowed", msg));
1078+
db.span_label(s1, &format!("{} needs to live until here", value_kind));
1079+
}
10671080
_ => {
10681081
match sub_span {
10691082
Some(s) => {

‎src/test/compile-fail/borrowck/borrowck-ref-into-rvalue.rs ‎src/test/ui/span/borrowck-ref-into-rvalue.rs

File renamed without changes.

‎src/test/ui/span/borrowck-ref-into-rvalue.stderr

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
error: borrowed value does not live long enough
2+
--> $DIR/borrowck-ref-into-rvalue.rs:18:5
3+
|
4+
14 | Some(ref m) => { //~ ERROR borrowed value does not live long enough
5+
| ----- borrow occurs here
6+
...
7+
18 | }
8+
| ^ borrowed value dropped here while still borrowed
9+
19 | println!("{}", *msg);
10+
20 | }
11+
| - borrowed value needs to live until here
12+
|
13+
= note: consider using a `let` binding to increase its lifetime
14+
15+
error: aborting due to previous error
16+

‎src/test/compile-fail/destructor-restrictions.rs ‎src/test/ui/span/destructor-restrictions.rs

File renamed without changes.

‎src/test/ui/span/destructor-restrictions.stderr

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error: `*a` does not live long enough
2+
--> $DIR/destructor-restrictions.rs:19:5
3+
|
4+
18 | *a.borrow() + 1 //~ ERROR `*a` does not live long enough
5+
| - borrow occurs here
6+
19 | };
7+
| ^- borrowed value needs to live until here
8+
| |
9+
| `*a` dropped here while still borrowed
10+
11+
error: aborting due to previous error
12+

‎src/test/ui/span/issue-11925.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ error: `x` does not live long enough
44
18 | let f = to_fn_once(move|| &x);
55
| ^
66
| |
7-
| does not live long enough
8-
| borrowed value only lives until here
7+
| borrow occurs here
8+
| `x` dropped here while still borrowed
99
...
1010
23 | }
1111
| - borrowed value needs to live until here

‎src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ error: `y` does not live long enough
99
= note: values in a scope are dropped in the opposite order they are created
1010

1111
error: `y` does not live long enough
12-
--> $DIR/issue-23338-locals-die-before-temps-of-body.rs:27:9
12+
--> $DIR/issue-23338-locals-die-before-temps-of-body.rs:28:5
1313
|
1414
27 | y.borrow().clone() //~ ERROR `y` does not live long enough
15-
| ^ does not live long enough
15+
| - borrow occurs here
1616
28 | };
17-
| -- borrowed value needs to live until here
17+
| ^- borrowed value needs to live until here
1818
| |
19-
| borrowed value only lives until here
19+
| `y` dropped here while still borrowed
2020

2121
error: aborting due to 2 previous errors
2222

‎src/test/compile-fail/mut-ptr-cant-outlive-ref.rs ‎src/test/ui/span/mut-ptr-cant-outlive-ref.rs

File renamed without changes.

‎src/test/ui/span/mut-ptr-cant-outlive-ref.stderr

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error: `b` does not live long enough
2+
--> $DIR/mut-ptr-cant-outlive-ref.rs:19:5
3+
|
4+
18 | p = &*b; //~ ERROR `b` does not live long enough
5+
| - borrow occurs here
6+
19 | }
7+
| ^ `b` dropped here while still borrowed
8+
20 | }
9+
| - borrowed value needs to live until here
10+
11+
error: aborting due to previous error
12+

‎src/test/compile-fail/range-2.rs ‎src/test/ui/span/range-2.rs

File renamed without changes.

‎src/test/ui/span/range-2.stderr

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
error: `a` does not live long enough
2+
--> $DIR/range-2.rs:20:5
3+
|
4+
17 | &a..&b
5+
| - borrow occurs here
6+
...
7+
20 | };
8+
| ^ `a` dropped here while still borrowed
9+
21 | }
10+
| - borrowed value needs to live until here
11+
12+
error: `b` does not live long enough
13+
--> $DIR/range-2.rs:20:5
14+
|
15+
17 | &a..&b
16+
| - borrow occurs here
17+
...
18+
20 | };
19+
| ^ `b` dropped here while still borrowed
20+
21 | }
21+
| - borrowed value needs to live until here
22+
23+
error: aborting due to 2 previous errors
24+

‎src/test/compile-fail/regionck-unboxed-closure-lifetimes.rs ‎src/test/ui/span/regionck-unboxed-closure-lifetimes.rs

File renamed without changes.

‎src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: `c` does not live long enough
2+
--> $DIR/regionck-unboxed-closure-lifetimes.rs:19:5
3+
|
4+
17 | let c_ref = &c; //~ ERROR `c` does not live long enough
5+
| - borrow occurs here
6+
18 | f = move |a: isize, b: isize| { a + b + *c_ref };
7+
19 | }
8+
| ^ `c` dropped here while still borrowed
9+
20 | }
10+
| - borrowed value needs to live until here
11+
12+
error: aborting due to previous error
13+

‎src/test/compile-fail/regions-close-over-type-parameter-2.rs ‎src/test/ui/span/regions-close-over-type-parameter-2.rs

File renamed without changes.

‎src/test/ui/span/regions-close-over-type-parameter-2.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: `tmp0` does not live long enough
2+
--> $DIR/regions-close-over-type-parameter-2.rs:35:5
3+
|
4+
33 | let tmp1 = &tmp0; //~ ERROR `tmp0` does not live long enough
5+
| ---- borrow occurs here
6+
34 | repeater3(tmp1)
7+
35 | };
8+
| ^- borrowed value needs to live until here
9+
| |
10+
| `tmp0` dropped here while still borrowed
11+
12+
error: aborting due to previous error
13+

‎src/test/compile-fail/regions-escape-loop-via-variable.rs ‎src/test/ui/span/regions-escape-loop-via-variable.rs

File renamed without changes.

‎src/test/ui/span/regions-escape-loop-via-variable.stderr

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error: `x` does not live long enough
2+
--> $DIR/regions-escape-loop-via-variable.rs:22:5
3+
|
4+
21 | p = &x; //~ ERROR `x` does not live long enough
5+
| - borrow occurs here
6+
22 | }
7+
| ^ `x` dropped here while still borrowed
8+
23 | }
9+
| - borrowed value needs to live until here
10+
11+
error: aborting due to previous error
12+

‎src/test/compile-fail/regions-escape-loop-via-vec.rs ‎src/test/ui/span/regions-escape-loop-via-vec.rs

File renamed without changes.

‎src/test/ui/span/regions-escape-loop-via-vec.stderr

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
error: `z` does not live long enough
2+
--> $DIR/regions-escape-loop-via-vec.rs:26:5
3+
|
4+
22 | _y.push(&mut z); //~ ERROR `z` does not live long enough
5+
| - borrow occurs here
6+
...
7+
26 | }
8+
| ^ `z` dropped here while still borrowed
9+
27 | //~^ NOTE borrowed value only lives until here
10+
28 | }
11+
| - borrowed value needs to live until here
12+
13+
error[E0503]: cannot use `x` because it was mutably borrowed
14+
--> $DIR/regions-escape-loop-via-vec.rs:18:11
15+
|
16+
14 | let mut _y = vec![&mut x];
17+
| - borrow of `x` occurs here
18+
...
19+
18 | while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
20+
| ^ use of borrowed `x`
21+
22+
error[E0503]: cannot use `x` because it was mutably borrowed
23+
--> $DIR/regions-escape-loop-via-vec.rs:20:13
24+
|
25+
14 | let mut _y = vec![&mut x];
26+
| - borrow of `x` occurs here
27+
...
28+
20 | let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed
29+
| ^^^^^ use of borrowed `x`
30+
31+
error[E0506]: cannot assign to `x` because it is borrowed
32+
--> $DIR/regions-escape-loop-via-vec.rs:24:9
33+
|
34+
14 | let mut _y = vec![&mut x];
35+
| - borrow of `x` occurs here
36+
...
37+
24 | x += 1; //~ ERROR cannot assign
38+
| ^^^^^^ assignment to borrowed `x` occurs here
39+
40+
error: aborting due to 4 previous errors
41+

‎src/test/compile-fail/regions-infer-borrow-scope-within-loop.rs ‎src/test/ui/span/regions-infer-borrow-scope-within-loop.rs

File renamed without changes.

‎src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: `*x` does not live long enough
2+
--> $DIR/regions-infer-borrow-scope-within-loop.rs:28:5
3+
|
4+
24 | y = borrow(&*x); //~ ERROR `*x` does not live long enough
5+
| -- borrow occurs here
6+
...
7+
28 | }
8+
| ^ `*x` dropped here while still borrowed
9+
29 | assert!(*y != 0);
10+
30 | }
11+
| - borrowed value needs to live until here
12+
13+
error: aborting due to previous error
14+

‎src/test/compile-fail/send-is-not-static-ensures-scoping.rs ‎src/test/ui/span/send-is-not-static-ensures-scoping.rs

File renamed without changes.

‎src/test/ui/span/send-is-not-static-ensures-scoping.stderr

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
error: `x` does not live long enough
2+
--> $DIR/send-is-not-static-ensures-scoping.rs:32:5
3+
|
4+
26 | let y = &x; //~ ERROR `x` does not live long enough
5+
| - borrow occurs here
6+
...
7+
32 | };
8+
| ^ `x` dropped here while still borrowed
9+
...
10+
35 | }
11+
| - borrowed value needs to live until here
12+
13+
error: `y` does not live long enough
14+
--> $DIR/send-is-not-static-ensures-scoping.rs:29:22
15+
|
16+
28 | scoped(|| {
17+
| -- capture occurs here
18+
29 | let _z = y;
19+
| ^ does not live long enough
20+
...
21+
32 | };
22+
| - borrowed value only lives until here
23+
...
24+
35 | }
25+
| - borrowed value needs to live until here
26+
27+
error: aborting due to 2 previous errors
28+

‎src/test/compile-fail/send-is-not-static-std-sync-2.rs ‎src/test/ui/span/send-is-not-static-std-sync-2.rs

File renamed without changes.

‎src/test/ui/span/send-is-not-static-std-sync-2.stderr

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
error: `x` does not live long enough
2+
--> $DIR/send-is-not-static-std-sync-2.rs:22:5
3+
|
4+
21 | Mutex::new(&x) //~ ERROR does not live long enough
5+
| - borrow occurs here
6+
22 | };
7+
| ^ `x` dropped here while still borrowed
8+
...
9+
25 | }
10+
| - borrowed value needs to live until here
11+
12+
error: `x` does not live long enough
13+
--> $DIR/send-is-not-static-std-sync-2.rs:31:5
14+
|
15+
30 | RwLock::new(&x) //~ ERROR does not live long enough
16+
| - borrow occurs here
17+
31 | };
18+
| ^ `x` dropped here while still borrowed
19+
32 | let _dangling = *lock.read().unwrap();
20+
33 | }
21+
| - borrowed value needs to live until here
22+
23+
error: `x` does not live long enough
24+
--> $DIR/send-is-not-static-std-sync-2.rs:41:5
25+
|
26+
39 | let _ = tx.send(&x); //~ ERROR does not live long enough
27+
| - borrow occurs here
28+
40 | (tx, rx)
29+
41 | };
30+
| ^ `x` dropped here while still borrowed
31+
...
32+
44 | }
33+
| - borrowed value needs to live until here
34+
35+
error: aborting due to 3 previous errors
36+

‎src/test/compile-fail/send-is-not-static-std-sync.rs ‎src/test/ui/span/send-is-not-static-std-sync.rs

File renamed without changes.

‎src/test/ui/span/send-is-not-static-std-sync.stderr

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
error: `z` does not live long enough
2+
--> $DIR/send-is-not-static-std-sync.rs:27:5
3+
|
4+
26 | *lock.lock().unwrap() = &z; //~ ERROR does not live long enough
5+
| - borrow occurs here
6+
27 | }
7+
| ^ `z` dropped here while still borrowed
8+
28 | }
9+
| - borrowed value needs to live until here
10+
11+
error[E0505]: cannot move out of `y` because it is borrowed
12+
--> $DIR/send-is-not-static-std-sync.rs:23:10
13+
|
14+
22 | *lock.lock().unwrap() = &*y;
15+
| -- borrow of `*y` occurs here
16+
23 | drop(y); //~ ERROR cannot move out
17+
| ^ move out of `y` occurs here
18+
19+
error: `z` does not live long enough
20+
--> $DIR/send-is-not-static-std-sync.rs:39:5
21+
|
22+
38 | *lock.write().unwrap() = &z; //~ ERROR does not live long enough
23+
| - borrow occurs here
24+
39 | }
25+
| ^ `z` dropped here while still borrowed
26+
40 | }
27+
| - borrowed value needs to live until here
28+
29+
error[E0505]: cannot move out of `y` because it is borrowed
30+
--> $DIR/send-is-not-static-std-sync.rs:35:10
31+
|
32+
34 | *lock.write().unwrap() = &*y;
33+
| -- borrow of `*y` occurs here
34+
35 | drop(y); //~ ERROR cannot move out
35+
| ^ move out of `y` occurs here
36+
37+
error: `z` does not live long enough
38+
--> $DIR/send-is-not-static-std-sync.rs:53:5
39+
|
40+
52 | tx.send(&z).unwrap(); //~ ERROR does not live long enough
41+
| - borrow occurs here
42+
53 | }
43+
| ^ `z` dropped here while still borrowed
44+
54 | }
45+
| - borrowed value needs to live until here
46+
47+
error[E0505]: cannot move out of `y` because it is borrowed
48+
--> $DIR/send-is-not-static-std-sync.rs:49:10
49+
|
50+
48 | tx.send(&*y);
51+
| -- borrow of `*y` occurs here
52+
49 | drop(y); //~ ERROR cannot move out
53+
| ^ move out of `y` occurs here
54+
55+
error: aborting due to 6 previous errors
56+

‎src/test/compile-fail/wf-method-late-bound-regions.rs ‎src/test/ui/span/wf-method-late-bound-regions.rs

File renamed without changes.

‎src/test/ui/span/wf-method-late-bound-regions.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: `pointer` does not live long enough
2+
--> $DIR/wf-method-late-bound-regions.rs:31:5
3+
|
4+
30 | f2.xmute(&pointer) //~ ERROR `pointer` does not live long enough
5+
| ------- borrow occurs here
6+
31 | };
7+
| ^ `pointer` dropped here while still borrowed
8+
32 | println!("{}", dangling);
9+
33 | }
10+
| - borrowed value needs to live until here
11+
12+
error: aborting due to previous error
13+

0 commit comments

Comments
 (0)