Skip to content

Commit 35ebbe3

Browse files
authored
Rollup merge of #71531 - spastorino:move-treat-err-as-bug-tests-to-ui, r=oli-obk
Move treat err as bug tests to ui cc `@oli-obk`
2 parents 921ec4b + 6d9efd1 commit 35ebbe3

File tree

7 files changed

+45
-14
lines changed

7 files changed

+45
-14
lines changed

src/test/run-make-fulldeps/treat-err-as-bug/Makefile

-7
This file was deleted.

src/test/run-make-fulldeps/treat-err-as-bug/delay_span_bug.rs

-4
This file was deleted.

src/test/run-make-fulldeps/treat-err-as-bug/err.rs

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// compile-flags: -Ztreat-err-as-bug
2+
// failure-status: 101
3+
// error-pattern: aborting due to `-Z treat-err-as-bug=1`
4+
// error-pattern: [trigger_delay_span_bug] trigger a delay span bug
5+
// normalize-stderr-test "note: .*\n\n" -> ""
6+
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
7+
8+
#![feature(rustc_attrs)]
9+
10+
#[rustc_error(delay_span_bug_from_inside_query)]
11+
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error: internal compiler error: delayed span bug triggered by #[rustc_error(delay_span_bug_from_inside_query)]
2+
--> $DIR/delay_span_bug.rs:11:1
3+
|
4+
LL | fn main() {}
5+
| ^^^^^^^^^
6+
7+
error: internal compiler error: unexpected panic
8+
9+
query stack during panic:
10+
#0 [trigger_delay_span_bug] trigger a delay span bug
11+
end of query stack

src/test/ui/treat-err-as-bug/err.rs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// compile-flags: -Ztreat-err-as-bug
2+
// failure-status: 101
3+
// error-pattern: aborting due to `-Z treat-err-as-bug=1`
4+
// error-pattern: [eval_to_allocation_raw] const-evaluating + checking `C`
5+
// normalize-stderr-test "note: .*\n\n" -> ""
6+
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
7+
8+
#![crate_type = "rlib"]
9+
10+
pub static C: u32 = 0 - 1;
11+
//~^ ERROR could not evaluate static initializer
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0080]: could not evaluate static initializer
2+
--> $DIR/err.rs:10:21
3+
|
4+
LL | pub static C: u32 = 0 - 1;
5+
| ^^^^^ attempt to compute `0_u32 - 1_u32`, which would overflow
6+
7+
error: internal compiler error: unexpected panic
8+
9+
query stack during panic:
10+
#0 [eval_to_allocation_raw] const-evaluating + checking `C`
11+
#1 [eval_to_allocation_raw] const-evaluating + checking `C`
12+
end of query stack

0 commit comments

Comments
 (0)