diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/consts/const-size_of-cycle.stderr | 3 | ||||
| -rw-r--r-- | tests/ui/consts/issue-44415.stderr | 3 | ||||
| -rw-r--r-- | tests/ui/dyn-star/param-env-region-infer.next.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/generics/issue-32498.rs | 1 | ||||
| -rw-r--r-- | tests/ui/layout/valid_range_oob.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/lint/invalid_value.stderr | 6 | ||||
| -rw-r--r-- | tests/ui/recursion/issue-26548-recursion-via-normalize.rs | 10 | ||||
| -rw-r--r-- | tests/ui/recursion/issue-26548-recursion-via-normalize.stderr | 10 | ||||
| -rw-r--r-- | tests/ui/recursion_limit/zero-overflow.rs | 2 | ||||
| -rw-r--r-- | tests/ui/recursion_limit/zero-overflow.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/sized/recursive-type-2.rs | 2 | ||||
| -rw-r--r-- | tests/ui/sized/recursive-type-2.stderr | 12 | ||||
| -rw-r--r-- | tests/ui/transmute/transmute-fat-pointers.rs | 12 | ||||
| -rw-r--r-- | tests/ui/type-alias-impl-trait/issue-53092-2.stderr | 2 |
14 files changed, 32 insertions, 41 deletions
diff --git a/tests/ui/consts/const-size_of-cycle.stderr b/tests/ui/consts/const-size_of-cycle.stderr index 08f0c1563cc..46b432357aa 100644 --- a/tests/ui/consts/const-size_of-cycle.stderr +++ b/tests/ui/consts/const-size_of-cycle.stderr @@ -15,8 +15,7 @@ note: ...which requires const-evaluating + checking `Foo::bytes::{constant#0}`.. LL | bytes: [u8; std::mem::size_of::<Foo>()] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which requires computing layout of `Foo`... - = note: ...which requires computing layout (naive) of `Foo`... - = note: ...which requires computing layout (naive) of `[u8; std::mem::size_of::<Foo>()]`... + = note: ...which requires computing layout of `[u8; std::mem::size_of::<Foo>()]`... = note: ...which requires normalizing `[u8; std::mem::size_of::<Foo>()]`... = note: ...which again requires evaluating type-level constant, completing the cycle note: cycle used when checking that `Foo` is well-formed diff --git a/tests/ui/consts/issue-44415.stderr b/tests/ui/consts/issue-44415.stderr index 7ff413def86..01d24a62081 100644 --- a/tests/ui/consts/issue-44415.stderr +++ b/tests/ui/consts/issue-44415.stderr @@ -15,8 +15,7 @@ note: ...which requires const-evaluating + checking `Foo::bytes::{constant#0}`.. LL | bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }], | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which requires computing layout of `Foo`... - = note: ...which requires computing layout (naive) of `Foo`... - = note: ...which requires computing layout (naive) of `[u8; unsafe { intrinsics::size_of::<Foo>() }]`... + = note: ...which requires computing layout of `[u8; unsafe { intrinsics::size_of::<Foo>() }]`... = note: ...which requires normalizing `[u8; unsafe { intrinsics::size_of::<Foo>() }]`... = note: ...which again requires evaluating type-level constant, completing the cycle note: cycle used when checking that `Foo` is well-formed diff --git a/tests/ui/dyn-star/param-env-region-infer.next.stderr b/tests/ui/dyn-star/param-env-region-infer.next.stderr index 51df71a373e..28aec533a00 100644 --- a/tests/ui/dyn-star/param-env-region-infer.next.stderr +++ b/tests/ui/dyn-star/param-env-region-infer.next.stderr @@ -9,7 +9,7 @@ note: ...which requires type-checking `make_dyn_star`... | LL | fn make_dyn_star<'a, T: PointerLike + Debug + 'a>(t: T) -> impl PointerLike + Debug + 'a { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = note: ...which requires computing layout (naive) of `make_dyn_star::{opaque#0}`... + = note: ...which requires computing layout of `make_dyn_star::{opaque#0}`... = note: ...which requires normalizing `make_dyn_star::{opaque#0}`... = note: ...which again requires computing type of `make_dyn_star::{opaque#0}`, completing the cycle note: cycle used when checking item types in top-level module diff --git a/tests/ui/generics/issue-32498.rs b/tests/ui/generics/issue-32498.rs index 0abd5b1a9b1..1b54401097e 100644 --- a/tests/ui/generics/issue-32498.rs +++ b/tests/ui/generics/issue-32498.rs @@ -1,6 +1,5 @@ // run-pass #![allow(dead_code)] -#![recursion_limit = "129"] // Making sure that no overflow occurs. diff --git a/tests/ui/layout/valid_range_oob.stderr b/tests/ui/layout/valid_range_oob.stderr index 772113fa5fb..a3a514fb830 100644 --- a/tests/ui/layout/valid_range_oob.stderr +++ b/tests/ui/layout/valid_range_oob.stderr @@ -1,6 +1,6 @@ error: the compiler unexpectedly panicked. this is a bug. query stack during panic: -#0 [naive_layout_of] computing layout (naive) of `Foo` -#1 [layout_of] computing layout of `Foo` +#0 [layout_of] computing layout of `Foo` +#1 [eval_to_allocation_raw] const-evaluating + checking `FOO` end of query stack diff --git a/tests/ui/lint/invalid_value.stderr b/tests/ui/lint/invalid_value.stderr index 066fdccbaad..57531b0968f 100644 --- a/tests/ui/lint/invalid_value.stderr +++ b/tests/ui/lint/invalid_value.stderr @@ -34,7 +34,8 @@ LL | let _val: Wrap<&'static T> = mem::zeroed(); | this code causes undefined behavior when executed | help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done | -note: references must be non-null (in this struct field) + = note: `Wrap<&T>` must be non-null +note: because references must be non-null (in this struct field) --> $DIR/invalid_value.rs:17:18 | LL | struct Wrap<T> { wrapped: T } @@ -49,7 +50,8 @@ LL | let _val: Wrap<&'static T> = mem::uninitialized(); | this code causes undefined behavior when executed | help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done | -note: references must be non-null (in this struct field) + = note: `Wrap<&T>` must be non-null +note: because references must be non-null (in this struct field) --> $DIR/invalid_value.rs:17:18 | LL | struct Wrap<T> { wrapped: T } diff --git a/tests/ui/recursion/issue-26548-recursion-via-normalize.rs b/tests/ui/recursion/issue-26548-recursion-via-normalize.rs index 14bc74f57f6..6c7fc4beb54 100644 --- a/tests/ui/recursion/issue-26548-recursion-via-normalize.rs +++ b/tests/ui/recursion/issue-26548-recursion-via-normalize.rs @@ -1,9 +1,9 @@ -//~ ERROR cycle detected when computing layout (naive) of `core::option::Option<S>` +//~ ERROR cycle detected when computing layout of `core::option::Option<S>` //~| 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 -//~| NOTE ...which requires computing layout (naive) of `S`... -//~| NOTE ...which requires computing layout (naive) of `core::option::Option<<S as Mirror>::It>`... -//~| NOTE ...which again requires computing layout (naive) of `core::option::Option<S>`, completing the cycle -//~| NOTE cycle used when computing layout (naive) of `core::option::Option<<S as Mirror>::It>` +//~| NOTE ...which requires computing layout of `S`... +//~| NOTE ...which requires computing layout of `core::option::Option<<S as Mirror>::It>`... +//~| NOTE ...which again requires computing layout of `core::option::Option<S>`, completing the cycle +//~| NOTE cycle used when computing layout of `core::option::Option<<S as Mirror>::It>` trait Mirror { type It: ?Sized; diff --git a/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr b/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr index 109ba278232..514bed60700 100644 --- a/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr +++ b/tests/ui/recursion/issue-26548-recursion-via-normalize.stderr @@ -1,9 +1,9 @@ -error[E0391]: cycle detected when computing layout (naive) of `core::option::Option<S>` +error[E0391]: cycle detected when computing layout of `core::option::Option<S>` | - = note: ...which requires computing layout (naive) of `S`... - = note: ...which requires computing layout (naive) of `core::option::Option<<S as Mirror>::It>`... - = note: ...which again requires computing layout (naive) of `core::option::Option<S>`, completing the cycle - = note: cycle used when computing layout (naive) of `core::option::Option<<S as Mirror>::It>` + = note: ...which requires computing layout of `S`... + = note: ...which requires computing layout of `core::option::Option<<S as Mirror>::It>`... + = note: ...which again requires computing layout of `core::option::Option<S>`, completing the cycle + = note: cycle used when computing layout of `core::option::Option<<S as Mirror>::It>` = 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: aborting due to previous error diff --git a/tests/ui/recursion_limit/zero-overflow.rs b/tests/ui/recursion_limit/zero-overflow.rs index 98b3da65135..77bd8185676 100644 --- a/tests/ui/recursion_limit/zero-overflow.rs +++ b/tests/ui/recursion_limit/zero-overflow.rs @@ -1,4 +1,4 @@ -//~ ERROR queries overflow the depth limit! +//~ ERROR overflow evaluating the requirement `&mut Self: DispatchFromDyn<&mut RustaceansAreAwesome> //~| HELP consider increasing the recursion limit // build-fail diff --git a/tests/ui/recursion_limit/zero-overflow.stderr b/tests/ui/recursion_limit/zero-overflow.stderr index 172c767d9f0..9007ec0d784 100644 --- a/tests/ui/recursion_limit/zero-overflow.stderr +++ b/tests/ui/recursion_limit/zero-overflow.stderr @@ -1,7 +1,7 @@ -error: queries overflow the depth limit! +error[E0275]: overflow evaluating the requirement `&mut Self: DispatchFromDyn<&mut RustaceansAreAwesome>` | = help: consider increasing the recursion limit by adding a `#![recursion_limit = "2"]` attribute to your crate (`zero_overflow`) - = note: query depth increased by 2 when computing layout of `()` error: aborting due to previous error +For more information about this error, try `rustc --explain E0275`. diff --git a/tests/ui/sized/recursive-type-2.rs b/tests/ui/sized/recursive-type-2.rs index 7ee5ee854d4..7d95417a6ff 100644 --- a/tests/ui/sized/recursive-type-2.rs +++ b/tests/ui/sized/recursive-type-2.rs @@ -1,5 +1,5 @@ // build-fail -//~^ ERROR cycle detected when computing layout (naive) of `Foo<()>` +//~^ ERROR cycle detected when computing layout of `Foo<()>` trait A { type Assoc: ?Sized; } diff --git a/tests/ui/sized/recursive-type-2.stderr b/tests/ui/sized/recursive-type-2.stderr index 502b0a4352c..0f72f74145e 100644 --- a/tests/ui/sized/recursive-type-2.stderr +++ b/tests/ui/sized/recursive-type-2.stderr @@ -1,8 +1,12 @@ -error[E0391]: cycle detected when computing layout (naive) of `Foo<()>` +error[E0391]: cycle detected when computing layout of `Foo<()>` | - = note: ...which requires computing layout (naive) of `<() as A>::Assoc`... - = note: ...which again requires computing layout (naive) of `Foo<()>`, completing the cycle - = note: cycle used when computing layout of `Foo<()>` + = note: ...which requires computing layout of `<() as A>::Assoc`... + = note: ...which again requires computing layout of `Foo<()>`, completing the cycle +note: cycle used when elaborating drops for `main` + --> $DIR/recursive-type-2.rs:11:1 + | +LL | fn main() { + | ^^^^^^^^^ = 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: aborting due to previous error diff --git a/tests/ui/transmute/transmute-fat-pointers.rs b/tests/ui/transmute/transmute-fat-pointers.rs index d373ff5f24a..7c1beffd14e 100644 --- a/tests/ui/transmute/transmute-fat-pointers.rs +++ b/tests/ui/transmute/transmute-fat-pointers.rs @@ -30,16 +30,4 @@ fn f<T, U: ?Sized>(x: &T) -> &U { unsafe { transmute(x) } //~ ERROR cannot transmute between types of different sizes } -fn g<T, U>(x: &T) -> Option<&U> { - unsafe { transmute(x) } -} - -fn h<T>(x: &[T]) -> Option<&dyn Send> { - unsafe { transmute(x) } -} - -fn i<T>(x: [usize; 1]) -> Option<&'static T> { - unsafe { transmute(x) } -} - fn main() { } diff --git a/tests/ui/type-alias-impl-trait/issue-53092-2.stderr b/tests/ui/type-alias-impl-trait/issue-53092-2.stderr index 9d90c6fbc58..6148131b491 100644 --- a/tests/ui/type-alias-impl-trait/issue-53092-2.stderr +++ b/tests/ui/type-alias-impl-trait/issue-53092-2.stderr @@ -9,7 +9,7 @@ note: ...which requires type-checking `CONST_BUG`... | LL | const CONST_BUG: Bug<u8, ()> = unsafe { std::mem::transmute(|_: u8| ()) }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = note: ...which requires computing layout (naive) of `Bug<u8, ()>`... + = note: ...which requires computing layout of `Bug<u8, ()>`... = note: ...which requires normalizing `Bug<u8, ()>`... = note: ...which again requires computing type of `Bug::{opaque#0}`, completing the cycle note: cycle used when checking item types in top-level module |