Skip to content

Commit 0f9a6ed

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#73515 - christianpoveda:livedrop-diagnostics, r=oli-obk
Add second message for LiveDrop errors This is an attempt to fix rust-lang#72907 by adding a second message to the `LiveDrop` diagnostics. Changing from this ``` error[E0493]: destructors cannot be evaluated at compile-time --> src/lib.rs:7:9 | 7 | let mut always_returned = None; | ^^^^^^^^^^^^^^^^^^^ constants cannot evaluate destructors error: aborting due to previous error ``` to this ``` error[E0493]: destructors cannot be evaluated at compile-time --> foo.rs:6:9 | 6 | let mut always_returned = None; | ^^^^^^^^^^^^^^^^^^^ constants cannot evaluate destructors ... 10 | always_returned = never_returned; | --------------- value is dropped here error: aborting due to previous error ``` r? @RalfJung @ecstatic-morse
2 parents cd18ac1 + 9355168 commit 0f9a6ed

File tree

14 files changed

+120
-24
lines changed

14 files changed

+120
-24
lines changed

‎src/librustc_mir/transform/check_consts/ops.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,20 @@ pub struct InlineAsm;
160160
impl NonConstOp for InlineAsm {}
161161

162162
#[derive(Debug)]
163-
pub struct LiveDrop;
163+
pub struct LiveDrop(pub Option<Span>);
164164
impl NonConstOp for LiveDrop {
165165
fn emit_error(&self, ccx: &ConstCx<'_, '_>, span: Span) {
166-
struct_span_err!(
166+
let mut diagnostic = struct_span_err!(
167167
ccx.tcx.sess,
168168
span,
169169
E0493,
170170
"destructors cannot be evaluated at compile-time"
171-
)
172-
.span_label(span, format!("{}s cannot evaluate destructors", ccx.const_kind()))
173-
.emit();
171+
);
172+
diagnostic.span_label(span, format!("{}s cannot evaluate destructors", ccx.const_kind()));
173+
if let Some(span) = self.0 {
174+
diagnostic.span_label(span, "value is dropped here");
175+
}
176+
diagnostic.emit();
174177
}
175178
}
176179

‎src/librustc_mir/transform/check_consts/post_drop_elaboration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl std::ops::Deref for CheckLiveDrops<'mir, 'tcx> {
5858

5959
impl CheckLiveDrops<'mir, 'tcx> {
6060
fn check_live_drop(&self, span: Span) {
61-
ops::non_const(self.ccx, ops::LiveDrop, span);
61+
ops::non_const(self.ccx, ops::LiveDrop(None), span);
6262
}
6363
}
6464

‎src/librustc_mir/transform/check_consts/validation.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,10 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
588588
};
589589

590590
if needs_drop {
591-
self.check_op_spanned(ops::LiveDrop, err_span);
591+
self.check_op_spanned(
592+
ops::LiveDrop(Some(terminator.source_info.span)),
593+
err_span,
594+
);
592595
}
593596
}
594597

‎src/test/ui/check-static-values-constraints.stderr‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ LL | ..SafeStruct{field1: SafeEnum::Va
55
| ___________________________________________^
66
LL | |
77
LL | | field2: SafeEnum::Variant1}};
8-
| |________________________________________________________________________________^ statics cannot evaluate destructors
8+
| | ^- value is dropped here
9+
| |________________________________________________________________________________|
10+
| statics cannot evaluate destructors
911

1012
error[E0010]: allocations are not allowed in statics
1113
--> $DIR/check-static-values-constraints.rs:79:33

‎src/test/ui/consts/const-eval/const_let.stderr‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,33 @@ error[E0493]: destructors cannot be evaluated at compile-time
22
--> $DIR/const_let.rs:16:32
33
|
44
LL | const Y: FakeNeedsDrop = { let mut x = FakeNeedsDrop; x = FakeNeedsDrop; x };
5-
| ^^^^^ constants cannot evaluate destructors
5+
| ^^^^^ - value is dropped here
6+
| |
7+
| constants cannot evaluate destructors
68

79
error[E0493]: destructors cannot be evaluated at compile-time
810
--> $DIR/const_let.rs:20:33
911
|
1012
LL | const Y2: FakeNeedsDrop = { let mut x; x = FakeNeedsDrop; x = FakeNeedsDrop; x };
11-
| ^^^^^ constants cannot evaluate destructors
13+
| ^^^^^ - value is dropped here
14+
| |
15+
| constants cannot evaluate destructors
1216

1317
error[E0493]: destructors cannot be evaluated at compile-time
1418
--> $DIR/const_let.rs:24:21
1519
|
1620
LL | const Z: () = { let mut x = None; x = Some(FakeNeedsDrop); };
17-
| ^^^^^ constants cannot evaluate destructors
21+
| ^^^^^ - value is dropped here
22+
| |
23+
| constants cannot evaluate destructors
1824

1925
error[E0493]: destructors cannot be evaluated at compile-time
2026
--> $DIR/const_let.rs:28:22
2127
|
2228
LL | const Z2: () = { let mut x; x = None; x = Some(FakeNeedsDrop); };
23-
| ^^^^^ constants cannot evaluate destructors
29+
| ^^^^^ - value is dropped here
30+
| |
31+
| constants cannot evaluate destructors
2432

2533
error: aborting due to 4 previous errors
2634

‎src/test/ui/consts/const-eval/issue-65394.stderr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ error[E0493]: destructors cannot be evaluated at compile-time
99
|
1010
LL | let mut x = Vec::<i32>::new();
1111
| ^^^^^ constants cannot evaluate destructors
12+
...
13+
LL | };
14+
| - value is dropped here
1215

1316
error: aborting due to 2 previous errors
1417

‎src/test/ui/consts/const-eval/livedrop.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#![feature(const_if_match)]
2+
#![feature(const_loop)]
3+
4+
const _: Option<Vec<i32>> = {
5+
let mut never_returned = Some(Vec::new());
6+
let mut always_returned = None; //~ ERROR destructors cannot be evaluated at compile-time
7+
8+
let mut i = 0;
9+
loop {
10+
always_returned = never_returned;
11+
never_returned = None;
12+
13+
i += 1;
14+
if i == 10 {
15+
break always_returned;
16+
}
17+
}
18+
};
19+
20+
fn main() {}

‎src/test/ui/consts/const-eval/livedrop.stderr‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0493]: destructors cannot be evaluated at compile-time
2+
--> $DIR/livedrop.rs:6:9
3+
|
4+
LL | let mut always_returned = None;
5+
| ^^^^^^^^^^^^^^^^^^^ constants cannot evaluate destructors
6+
...
7+
LL | always_returned = never_returned;
8+
| --------------- value is dropped here
9+
10+
error: aborting due to previous error
11+
12+
For more information about this error, try `rustc --explain E0493`.

‎src/test/ui/consts/control-flow/drop-fail.stock.stderr‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,36 @@ error[E0493]: destructors cannot be evaluated at compile-time
33
|
44
LL | let x = Some(Vec::new());
55
| ^ constants cannot evaluate destructors
6+
...
7+
LL | };
8+
| - value is dropped here
69

710
error[E0493]: destructors cannot be evaluated at compile-time
811
--> $DIR/drop-fail.rs:23:9
912
|
1013
LL | let vec_tuple = (Vec::new(),);
1114
| ^^^^^^^^^ constants cannot evaluate destructors
15+
...
16+
LL | };
17+
| - value is dropped here
1218

1319
error[E0493]: destructors cannot be evaluated at compile-time
1420
--> $DIR/drop-fail.rs:31:9
1521
|
1622
LL | let x: Result<_, Vec<i32>> = Ok(Vec::new());
1723
| ^ constants cannot evaluate destructors
24+
...
25+
LL | };
26+
| - value is dropped here
1827

1928
error[E0493]: destructors cannot be evaluated at compile-time
2029
--> $DIR/drop-fail.rs:41:9
2130
|
2231
LL | let mut tmp = None;
2332
| ^^^^^^^ constants cannot evaluate destructors
33+
...
34+
LL | };
35+
| - value is dropped here
2436

2537
error: aborting due to 4 previous errors
2638

‎src/test/ui/consts/min_const_fn/min_const_fn.stderr‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ error[E0493]: destructors cannot be evaluated at compile-time
22
--> $DIR/min_const_fn.rs:37:25
33
|
44
LL | const fn into_inner(self) -> T { self.0 }
5-
| ^^^^ constant functions cannot evaluate destructors
5+
| ^^^^ - value is dropped here
6+
| |
7+
| constant functions cannot evaluate destructors
68

79
error[E0723]: mutable references in const fn are unstable
810
--> $DIR/min_const_fn.rs:39:36
@@ -17,7 +19,9 @@ error[E0493]: destructors cannot be evaluated at compile-time
1719
--> $DIR/min_const_fn.rs:44:28
1820
|
1921
LL | const fn into_inner_lt(self) -> T { self.0 }
20-
| ^^^^ constant functions cannot evaluate destructors
22+
| ^^^^ - value is dropped here
23+
| |
24+
| constant functions cannot evaluate destructors
2125

2226
error[E0723]: mutable references in const fn are unstable
2327
--> $DIR/min_const_fn.rs:46:42
@@ -32,7 +36,9 @@ error[E0493]: destructors cannot be evaluated at compile-time
3236
--> $DIR/min_const_fn.rs:51:27
3337
|
3438
LL | const fn into_inner_s(self) -> T { self.0 }
35-
| ^^^^ constant functions cannot evaluate destructors
39+
| ^^^^ - value is dropped here
40+
| |
41+
| constant functions cannot evaluate destructors
3642

3743
error[E0723]: mutable references in const fn are unstable
3844
--> $DIR/min_const_fn.rs:53:38

0 commit comments

Comments
 (0)