Skip to content

Commit 74af01b

Browse files
committed
Revert tests
1 parent d139968 commit 74af01b

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/test/ui/associated-consts/defaults-cyclic-fail.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// build-fail
2-
//~^ ERROR cycle detected when normalizing
2+
//~^ ERROR cycle detected when normalizing `<() as Tr>::A`
33

44
// Cyclic assoc. const defaults don't error unless *used*
55
trait Tr {

src/test/ui/consts/const-eval/const-eval-query-stack.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// compile-flags: -Ztreat-err-as-bug=1
1+
//~ERROR constructed but no error reported
2+
// compile-flags: -Ztreat-err-as-bug=2
23
// build-fail
34
// failure-status: 101
45
// rustc-env:RUST_BACKTRACE=1
Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
warning: any use of this value will cause an error
2-
--> $DIR/const-eval-query-stack.rs:19:16
2+
--> $DIR/const-eval-query-stack.rs:20:16
33
|
44
LL | const X: i32 = 1 / 0;
55
| ---------------^^^^^-
66
| |
77
| attempt to divide `1_i32` by zero
88
|
99
note: the lint level is defined here
10-
--> $DIR/const-eval-query-stack.rs:18:8
10+
--> $DIR/const-eval-query-stack.rs:19:8
1111
|
1212
LL | #[warn(const_err)]
1313
| ^^^^^^^^^
1414
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1515
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
1616

1717
error[E0080]: evaluation of constant value failed
18-
--> $DIR/const-eval-query-stack.rs:23:28
18+
--> $DIR/const-eval-query-stack.rs:24:28
1919
|
2020
LL | let x: &'static i32 = &X;
2121
| ^ referenced constant has errors
22-
2322
query stack during panic:
24-
#0 [eval_to_allocation_raw] const-evaluating + checking `main::promoted[1]`
25-
#1 [eval_to_const_value_raw] simplifying constant for the type system `main::promoted[1]`
26-
#2 [eval_to_const_value_raw] simplifying constant for the type system `main::promoted[1]`
27-
#3 [normalize_mir_const_after_erasing_regions] normalizing `main::promoted[1]`
28-
#4 [optimized_mir] optimizing MIR for `main`
29-
#5 [collect_and_partition_mono_items] collect_and_partition_mono_items
23+
#0 [normalize_mir_const_after_erasing_regions] normalizing `main::promoted[1]`
24+
#1 [optimized_mir] optimizing MIR for `main`
25+
#2 [collect_and_partition_mono_items] collect_and_partition_mono_items
3026
end of query stack

0 commit comments

Comments
 (0)