add -Znext-solver versions to tests

BennoLossin · BennoLossin · commit 06c599c5af13 · 2025-09-19T12:19:05.000+02:00
diff --git a/library/std/tests/field-projections-basic.rs b/library/std/tests/field-projections-basic.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next]: compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/library/std/tests/field-projections-clone-copy.rs b/library/std/tests/field-projections-clone-copy.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next]: compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/library/std/tests/field-projections-cyclic.rs b/library/std/tests/field-projections-cyclic.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next]: compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/tests/ui/field_projections/deny-drop-impl.next.stderr b/tests/ui/field_projections/deny-drop-impl.next.stderr
@@ -1,5 +1,5 @@
 error[E0120]: the `Drop` trait may only be implemented for local structs, enums, and unions
-  --> $DIR/deny-drop-impl.rs:8:15
+  --> $DIR/deny-drop-impl.rs:10:15
    |
 LL | impl Drop for field_of!(MyStruct, 0) {
    |               ^^^^^^^^^^^^^^^^^^^^^^ must be a struct, enum, or union in the current crate
diff --git a/tests/ui/field_projections/deny-drop-impl.old.stderr b/tests/ui/field_projections/deny-drop-impl.old.stderr
@@ -0,0 +1,11 @@
+error[E0120]: the `Drop` trait may only be implemented for local structs, enums, and unions
+  --> $DIR/deny-drop-impl.rs:10:15
+   |
+LL | impl Drop for field_of!(MyStruct, 0) {
+   |               ^^^^^^^^^^^^^^^^^^^^^^ must be a struct, enum, or union in the current crate
+   |
+   = note: this error originates in the macro `field_of` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0120`.
diff --git a/tests/ui/field_projections/deny-drop-impl.rs b/tests/ui/field_projections/deny-drop-impl.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/tests/ui/field_projections/deny-manual-impl.next.stderr b/tests/ui/field_projections/deny-manual-impl.next.stderr
@@ -1,11 +1,11 @@
 error[E0322]: explicit impls for the `UnalignedField` trait are not permitted
-  --> $DIR/deny-manual-impl.rs:9:1
+  --> $DIR/deny-manual-impl.rs:11:1
    |
 LL | unsafe impl UnalignedField for MyStruct {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `UnalignedField` not allowed
 
 error[E0322]: explicit impls for the `Field` trait are not permitted
-  --> $DIR/deny-manual-impl.rs:16:1
+  --> $DIR/deny-manual-impl.rs:18:1
    |
 LL | unsafe impl Field for field_of!(MyStruct, 0) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Field` not allowed
diff --git a/tests/ui/field_projections/deny-manual-impl.rs b/tests/ui/field_projections/deny-manual-impl.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/tests/ui/field_projections/deny-private-field.rs b/tests/ui/field_projections/deny-private-field.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/tests/ui/field_projections/enum.rs b/tests/ui/field_projections/enum.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 //@ run-fail
 #![allow(incomplete_features)]
 #![feature(field_projections)]
diff --git a/tests/ui/field_projections/incoherent-impl.next.stderr b/tests/ui/field_projections/incoherent-impl.next.stderr
@@ -1,5 +1,5 @@
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/incoherent-impl.rs:14:1
+  --> $DIR/incoherent-impl.rs:16:1
    |
 LL | impl extern_crate::ForeignTrait for field_of!(Point, x) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------------
@@ -11,7 +11,7 @@ LL | impl extern_crate::ForeignTrait for field_of!(Point, x) {}
    = note: define and implement a trait or new type instead
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/incoherent-impl.rs:24:1
+  --> $DIR/incoherent-impl.rs:26:1
    |
 LL | impl ForeignTrait for field_of!(Player, pos.x) {}
    | ^^^^^^^^^^^^^^^^^^^^^^------------------------
@@ -23,7 +23,7 @@ LL | impl ForeignTrait for field_of!(Player, pos.x) {}
    = note: define and implement a trait or new type instead
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/incoherent-impl.rs:33:1
+  --> $DIR/incoherent-impl.rs:35:1
    |
 LL | impl ForeignTrait for field_of!((usize, usize), 0) {}
    | ^^^^^^^^^^^^^^^^^^^^^^----------------------------
diff --git a/tests/ui/field_projections/incoherent-impl.old.stderr b/tests/ui/field_projections/incoherent-impl.old.stderr
@@ -0,0 +1,39 @@
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/incoherent-impl.rs:16:1
+   |
+LL | impl extern_crate::ForeignTrait for field_of!(Point, x) {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------------
+   |                                     |
+   |                                     `Point` is not defined in the current crate
+   |
+   = note: impl doesn't have any local type before any uncovered type parameters
+   = note: for more information see https://doc.rust-lang.org/reference/items/implementations.html#orphan-rules
+   = note: define and implement a trait or new type instead
+
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/incoherent-impl.rs:26:1
+   |
+LL | impl ForeignTrait for field_of!(Player, pos.x) {}
+   | ^^^^^^^^^^^^^^^^^^^^^^------------------------
+   |                       |
+   |                       `Point` is not defined in the current crate
+   |
+   = note: impl doesn't have any local type before any uncovered type parameters
+   = note: for more information see https://doc.rust-lang.org/reference/items/implementations.html#orphan-rules
+   = note: define and implement a trait or new type instead
+
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/incoherent-impl.rs:35:1
+   |
+LL | impl ForeignTrait for field_of!((usize, usize), 0) {}
+   | ^^^^^^^^^^^^^^^^^^^^^^----------------------------
+   |                       |
+   |                       this is not defined in the current crate because tuples are always foreign
+   |
+   = note: impl doesn't have any local type before any uncovered type parameters
+   = note: for more information see https://doc.rust-lang.org/reference/items/implementations.html#orphan-rules
+   = note: define and implement a trait or new type instead
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0117`.
diff --git a/tests/ui/field_projections/incoherent-impl.rs b/tests/ui/field_projections/incoherent-impl.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 //@ aux-build:extern-crate.rs
 #![allow(incomplete_features)]
 #![feature(field_projections)]
diff --git a/tests/ui/field_projections/not-field-if-packed.next.stderr b/tests/ui/field_projections/not-field-if-packed.next.stderr
@@ -1,11 +1,11 @@
 error[E0277]: the trait bound `field_of!(MyStruct, 0): Field` is not satisfied
-  --> $DIR/not-field-if-packed.rs:12:20
+  --> $DIR/not-field-if-packed.rs:14:20
    |
 LL |     assert_field::<field_of!(MyStruct, 0)>();
    |                    ^^^^^^^^^^^^^^^^^^^^^^ the trait `Field` is not implemented for `field_of!(MyStruct, 0)`
    |
 note: required by a bound in `assert_field`
-  --> $DIR/not-field-if-packed.rs:9:20
+  --> $DIR/not-field-if-packed.rs:11:20
    |
 LL | fn assert_field<F: Field>() {}
    |                    ^^^^^ required by this bound in `assert_field`
diff --git a/tests/ui/field_projections/not-field-if-packed.old.stderr b/tests/ui/field_projections/not-field-if-packed.old.stderr
@@ -0,0 +1,15 @@
+error[E0277]: the trait bound `field_of!(MyStruct, 0): Field` is not satisfied
+  --> $DIR/not-field-if-packed.rs:14:20
+   |
+LL |     assert_field::<field_of!(MyStruct, 0)>();
+   |                    ^^^^^^^^^^^^^^^^^^^^^^ the trait `Field` is not implemented for `field_of!(MyStruct, 0)`
+   |
+note: required by a bound in `assert_field`
+  --> $DIR/not-field-if-packed.rs:11:20
+   |
+LL | fn assert_field<F: Field>() {}
+   |                    ^^^^^ required by this bound in `assert_field`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/field_projections/not-field-if-packed.rs b/tests/ui/field_projections/not-field-if-packed.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 #![allow(incomplete_features)]
 #![feature(field_projections)]
 
diff --git a/tests/ui/field_projections/union.rs b/tests/ui/field_projections/union.rs
@@ -1,3 +1,5 @@
+//@ revisions: old next
+//@ [next] compile-flags: -Znext-solver
 //@ run-pass
 #![allow(incomplete_features, dead_code)]
 #![feature(field_projections)]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//@ revisions: old next`
	`2`	`+//@ [next]: compile-flags: -Znext-solver`
`1`	`3`	`#![allow(incomplete_features)]`
`2`	`4`	`#![feature(field_projections)]`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0120]: the `Drop` trait may only be implemented for local structs, enums, and unions
`2`		`- --> $DIR/deny-drop-impl.rs:8:15`
	`2`	`+ --> $DIR/deny-drop-impl.rs:10:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| impl Drop for field_of!(MyStruct, 0) {`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^ must be a struct, enum, or union in the current crate`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//@ revisions: old next`
	`2`	`+//@ [next] compile-flags: -Znext-solver`
`1`	`3`	`#![allow(incomplete_features)]`
`2`	`4`	`#![feature(field_projections)]`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	error[E0322]: explicit impls for the `UnalignedField` trait are not permitted
`2`		`- --> $DIR/deny-manual-impl.rs:9:1`
	`2`	`+ --> $DIR/deny-manual-impl.rs:11:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| unsafe impl UnalignedField for MyStruct {`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `UnalignedField` not allowed
`6`	`6`
`7`	`7`	error[E0322]: explicit impls for the `Field` trait are not permitted
`8`		`- --> $DIR/deny-manual-impl.rs:16:1`
	`8`	`+ --> $DIR/deny-manual-impl.rs:18:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| unsafe impl Field for field_of!(MyStruct, 0) {}`
`11`	`11`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Field` not allowed