Skip to content

Commit 94586bc

Browse files
RalfJungoli-obk
authored andcommitted
fix ui tests (rebase fallout)
1 parent b81302f commit 94586bc

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/test/ui/consts/const-eval/promoted_const_fn_fail_deny_const_err.stderr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ LL | #![deny(const_err)]
1616
| ^^^^^^^^^
1717

1818
error: aborting due to previous error
19+

src/test/ui/consts/const-size_of-cycle.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}`
2-
--> $DIR/const-size_of-cycle.rs:14:17
2+
--> $DIR/const-size_of-cycle.rs:16:17
33
|
44
LL | bytes: [u8; std::mem::size_of::<Foo>()]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -12,13 +12,13 @@ LL | intrinsics::size_of::<T>()
1212
note: ...which requires computing layout of `Foo`...
1313
note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All }, value: [u8; _] }`...
1414
note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}`...
15-
--> $DIR/const-size_of-cycle.rs:14:17
15+
--> $DIR/const-size_of-cycle.rs:16:17
1616
|
1717
LL | bytes: [u8; std::mem::size_of::<Foo>()]
1818
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1919
= note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}`, completing the cycle
2020
note: cycle used when processing `Foo`
21-
--> $DIR/const-size_of-cycle.rs:13:1
21+
--> $DIR/const-size_of-cycle.rs:15:1
2222
|
2323
LL | struct Foo {
2424
| ^^^^^^^^^^

0 commit comments

Comments
 (0)