diff options
| author | Ralf Jung <post@ralfj.de> | 2023-07-23 09:27:28 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-07-23 09:27:28 +0200 |
| commit | 8a3b7463ed657ddc3d705c44028f1fe7915edb60 (patch) | |
| tree | d5cc4f8f0bbfae65d776880374519df12393f27e /src/tools/miri/tests | |
| parent | 46ddf460afb6b277700f1bac9a3e26b34dc2ed62 (diff) | |
| parent | cec34a43b1b14f4e39363f3b283d7ac4f593ee81 (diff) | |
| download | rust-8a3b7463ed657ddc3d705c44028f1fe7915edb60.tar.gz rust-8a3b7463ed657ddc3d705c44028f1fe7915edb60.zip | |
Merge from rustc
Diffstat (limited to 'src/tools/miri/tests')
| -rw-r--r-- | src/tools/miri/tests/fail/layout_cycle.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/layout_cycle.stderr | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/miri/tests/fail/layout_cycle.rs b/src/tools/miri/tests/fail/layout_cycle.rs index d6a937de15c..3e0dd881db8 100644 --- a/src/tools/miri/tests/fail/layout_cycle.rs +++ b/src/tools/miri/tests/fail/layout_cycle.rs @@ -1,5 +1,5 @@ //@error-in-other-file: a cycle occurred during layout computation -//~^ ERROR: cycle detected when computing layout (naive) of +//~^ ERROR: cycle detected when computing layout of use std::mem; diff --git a/src/tools/miri/tests/fail/layout_cycle.stderr b/src/tools/miri/tests/fail/layout_cycle.stderr index ccf93a9def4..38907a1c50c 100644 --- a/src/tools/miri/tests/fail/layout_cycle.stderr +++ b/src/tools/miri/tests/fail/layout_cycle.stderr @@ -1,8 +1,7 @@ -error[E0391]: cycle detected when computing layout (naive) of `S<S<()>>` +error[E0391]: cycle detected when computing layout of `S<S<()>>` | - = note: ...which requires computing layout (naive) of `<S<()> as Tr>::I`... - = note: ...which again requires computing layout (naive) of `S<S<()>>`, completing the cycle - = note: cycle used when computing layout of `S<S<()>>` + = note: ...which requires computing layout of `<S<()> as Tr>::I`... + = note: ...which again requires computing layout of `S<S<()>>`, completing the cycle = 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: post-monomorphization error: a cycle occurred during layout computation |