Skip to content

Commit acce384

Browse files
borsbors
authored
Auto merge of #37554 - mikhail-m1:dnlle, r=jonathandturner
Improve "Doesn't live long enough" error case with temporary variable issue #36279 part of #35233 r? @jonathandturner
2 parents f3af8c8 + cfdf763 commit acce384

File tree

9 files changed

+63
-24
lines changed

9 files changed

+63
-24
lines changed

‎src/librustc_borrowck/borrowck/mod.rs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,11 +1009,11 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
10091009
}
10101010

10111011
err_out_of_scope(super_scope, sub_scope, cause) => {
1012-
let (value_kind, value_msg, is_temporary) = match err.cmt.cat {
1012+
let (value_kind, value_msg) = match err.cmt.cat {
10131013
mc::Categorization::Rvalue(_) =>
1014-
("temporary value", "temporary value created here", true),
1014+
("temporary value", "temporary value created here"),
10151015
_ =>
1016-
("borrowed value", "does not live long enough", false)
1016+
("borrowed value", "borrow occurs here")
10171017
};
10181018

10191019
let is_closure = match cause {
@@ -1026,14 +1026,14 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
10261026
Some(primary) => {
10271027
db.span = MultiSpan::from_span(s);
10281028
db.span_label(primary, &format!("capture occurs here"));
1029-
db.span_label(s, &value_msg);
1029+
db.span_label(s, &"does not live long enough");
10301030
true
10311031
}
10321032
None => false
10331033
}
10341034
}
10351035
_ => {
1036-
db.span_label(error_span, &value_msg);
1036+
db.span_label(error_span, &"does not live long enough");
10371037
false
10381038
}
10391039
};
@@ -1043,11 +1043,11 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
10431043

10441044
match (sub_span, super_span) {
10451045
(Some(s1), Some(s2)) if s1 == s2 => {
1046-
if !is_temporary && !is_closure {
1046+
if !is_closure {
10471047
db.span = MultiSpan::from_span(s1);
1048-
db.span_label(error_span, &format!("borrow occurs here"));
1048+
db.span_label(error_span, &value_msg);
10491049
let msg = match opt_loan_path(&err.cmt) {
1050-
None => "borrowed value".to_string(),
1050+
None => value_kind.to_string(),
10511051
Some(lp) => {
10521052
format!("`{}`", self.loan_path_to_string(&lp))
10531053
}
@@ -1060,17 +1060,16 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
10601060
db.note("values in a scope are dropped in the opposite order \
10611061
they are created");
10621062
}
1063-
(Some(s1), Some(s2)) if !is_temporary && !is_closure => {
1063+
(Some(s1), Some(s2)) if !is_closure => {
10641064
db.span = MultiSpan::from_span(s2);
1065-
db.span_label(error_span, &format!("borrow occurs here"));
1065+
db.span_label(error_span, &value_msg);
10661066
let msg = match opt_loan_path(&err.cmt) {
1067-
None => "borrowed value".to_string(),
1067+
None => value_kind.to_string(),
10681068
Some(lp) => {
10691069
format!("`{}`", self.loan_path_to_string(&lp))
10701070
}
10711071
};
1072-
db.span_label(s2,
1073-
&format!("{} dropped here while still borrowed", msg));
1072+
db.span_label(s2, &format!("{} dropped here while still borrowed", msg));
10741073
db.span_label(s1, &format!("{} needs to live until here", value_kind));
10751074
}
10761075
_ => {

‎src/test/ui/lifetimes/borrowck-let-suggestion.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: borrowed value does not live long enough
2-
--> $DIR/borrowck-let-suggestion.rs:12:13
2+
--> $DIR/borrowck-let-suggestion.rs:12:23
33
|
44
12 | let x = [1].iter();
5-
| ^^^ - temporary value only lives until here
5+
| --- ^ temporary value dropped here while still borrowed
66
| |
77
| temporary value created here
88
13 | }

‎src/test/ui/span/borrowck-let-suggestion-suffixes.stderr‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ error: `young[..]` does not live long enough
1010
= note: values in a scope are dropped in the opposite order they are created
1111

1212
error: borrowed value does not live long enough
13-
--> $DIR/borrowck-let-suggestion-suffixes.rs:24:14
13+
--> $DIR/borrowck-let-suggestion-suffixes.rs:24:18
1414
|
1515
24 | v3.push(&'x'); // statement 6
16-
| ^^^ - temporary value only lives until here
16+
| --- ^ temporary value dropped here while still borrowed
1717
| |
1818
| temporary value created here
1919
...
@@ -23,10 +23,10 @@ error: borrowed value does not live long enough
2323
= note: consider using a `let` binding to increase its lifetime
2424

2525
error: borrowed value does not live long enough
26-
--> $DIR/borrowck-let-suggestion-suffixes.rs:34:18
26+
--> $DIR/borrowck-let-suggestion-suffixes.rs:34:22
2727
|
2828
34 | v4.push(&'y');
29-
| ^^^ - temporary value only lives until here
29+
| --- ^ temporary value dropped here while still borrowed
3030
| |
3131
| temporary value created here
3232
...
@@ -36,10 +36,10 @@ error: borrowed value does not live long enough
3636
= note: consider using a `let` binding to increase its lifetime
3737

3838
error: borrowed value does not live long enough
39-
--> $DIR/borrowck-let-suggestion-suffixes.rs:45:14
39+
--> $DIR/borrowck-let-suggestion-suffixes.rs:45:18
4040
|
4141
45 | v5.push(&'z');
42-
| ^^^ - temporary value only lives until here
42+
| --- ^ temporary value dropped here while still borrowed
4343
| |
4444
| temporary value created here
4545
...

‎src/test/compile-fail/issue-15480.rs‎ renamed to ‎src/test/ui/span/issue-15480.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
fn main() {
1212
let v = vec![
1313
&3
14-
//~^ ERROR borrowed value does not live long enough
1514
];
1615

1716
for &&x in &v {

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
error: borrowed value does not live long enough
2+
--> $DIR/issue-15480.rs:14:6
3+
|
4+
13 | &3
5+
| - temporary value created here
6+
14 | ];
7+
| ^ temporary value dropped here while still borrowed
8+
...
9+
19 | }
10+
| - temporary value needs to live until here
11+
|
12+
= note: consider using a `let` binding to increase its lifetime
13+
14+
error: aborting due to previous error
15+

‎src/test/compile-fail/regions-close-over-borrowed-ref-in-obj.rs‎ renamed to ‎src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl<'a> Foo for &'a isize { }
1717
fn main() {
1818
let blah;
1919
{
20-
let ss: &isize = &1; //~ ERROR borrowed value does not live long enough
20+
let ss: &isize = &1;
2121
blah = box ss as Box<Foo>;
2222
}
2323
}

‎src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: borrowed value does not live long enough
2+
--> $DIR/regions-close-over-borrowed-ref-in-obj.rs:22:5
3+
|
4+
20 | let ss: &isize = &1;
5+
| - temporary value created here
6+
21 | blah = box ss as Box<Foo>;
7+
22 | }
8+
| ^ temporary value dropped here while still borrowed
9+
23 | }
10+
| - temporary value needs to live until here
11+
12+
error: aborting due to previous error
13+

‎src/test/compile-fail/slice-borrow.rs‎ renamed to ‎src/test/ui/span/slice-borrow.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
fn main() {
1414
let y;
1515
{
16-
let x: &[isize] = &[1, 2, 3, 4, 5]; //~ ERROR borrowed value does not live long enough
16+
let x: &[isize] = &[1, 2, 3, 4, 5];
1717
y = &x[1..];
1818
}
1919
}

‎src/test/ui/span/slice-borrow.stderr‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: borrowed value does not live long enough
2+
--> $DIR/slice-borrow.rs:18:5
3+
|
4+
16 | let x: &[isize] = &[1, 2, 3, 4, 5];
5+
| --------------- temporary value created here
6+
17 | y = &x[1..];
7+
18 | }
8+
| ^ temporary value dropped here while still borrowed
9+
19 | }
10+
| - temporary value needs to live until here
11+
12+
error: aborting due to previous error
13+

0 commit comments

Comments
 (0)