Skip to content

Commit

Permalink
Unrolled build for rust-lang#127239
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127239 - RalfJung:big-endian, r=Nadrieril

remove unnecessary ignore-endian-big from stack-overflow-trait-infer …

Follow-up to [this](rust-lang#122895 (comment)) discussion
  • Loading branch information
rust-timer authored Jul 3, 2024
2 parents d68fe4e + 6c803ff commit 5ede03e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tests/ui/sized/stack-overflow-trait-infer-98842.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ error[E0391]: cycle detected when computing layout of `Foo`
= note: ...which requires computing layout of `<&'static Foo as core::ops::deref::Deref>::Target`...
= note: ...which again requires computing layout of `Foo`, completing the cycle
note: cycle used when const-evaluating + checking `_`
--> $DIR/stack-overflow-trait-infer-98842.rs:15:1
--> $DIR/stack-overflow-trait-infer-98842.rs:14:1
|
LL | const _: *const Foo = 0 as _;
| ^^^^^^^^^^^^^^^^^^^
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error[E0080]: evaluation of constant value failed
--> $DIR/stack-overflow-trait-infer-98842.rs:15:1
--> $DIR/stack-overflow-trait-infer-98842.rs:14:1
|
LL | const _: *const Foo = 0 as _;
| ^^^^^^^^^^^^^^^^^^^ a cycle occurred during layout computation
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/sized/stack-overflow-trait-infer-98842.64bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ error[E0391]: cycle detected when computing layout of `Foo`
= note: ...which requires computing layout of `<&'static Foo as core::ops::deref::Deref>::Target`...
= note: ...which again requires computing layout of `Foo`, completing the cycle
note: cycle used when const-evaluating + checking `_`
--> $DIR/stack-overflow-trait-infer-98842.rs:15:1
--> $DIR/stack-overflow-trait-infer-98842.rs:14:1
|
LL | const _: *const Foo = 0 as _;
| ^^^^^^^^^^^^^^^^^^^
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error[E0080]: evaluation of constant value failed
--> $DIR/stack-overflow-trait-infer-98842.rs:15:1
--> $DIR/stack-overflow-trait-infer-98842.rs:14:1
|
LL | const _: *const Foo = 0 as _;
| ^^^^^^^^^^^^^^^^^^^ a cycle occurred during layout computation
Expand Down
3 changes: 1 addition & 2 deletions tests/ui/sized/stack-overflow-trait-infer-98842.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
//@ check-fail
//@ edition:2021
//@ stderr-per-bitwidth
//@ ignore-endian-big
//~^^^^^^ ERROR cycle detected when computing layout of `Foo`
//~^^^^^ ERROR cycle detected when computing layout of `Foo`

// If the inner `Foo` is named through an associated type,
// the "infinite size" error does not occur.
Expand Down

0 comments on commit 5ede03e

Please sign in to comment.