bless more than merely diagnostics change

Author: adwinwhite

tests/crashes/101557.rs

@@ -1,12 +1,14 @@
-//@ revisions: current next
-//@[next] compile-flags: -Znext-solver
-//@ ignore-compare-mode-next-solver (explicit revisions)
+//@ known-bug: #155761
+//@compile-flags: -Znext-solver
 
 // A regression test for https://github.com/rust-lang/rust/issues/151329.
 // Ensures we do not trigger an ICE when normalization fails for a
 // projection on a trait object, even if the projection has the same
 // trait id as the object's bound.
 
+// ICE again after moving to eager normalization in the next solver.
+// #155761 has a simplified variant which causes ICE without eager normalization.
+
 trait Foo {
     type V;
 }
@@ -18,12 +20,8 @@ struct Bar<T: Foo + ?Sized> {
 }
 
 impl<T: Foo> Bar<dyn Callback<T>> {
-    //~^ ERROR: the trait bound `(dyn Callback<T> + 'static): Foo` is not satisfied
     fn event(&self) {
-        //~^ ERROR: the trait bound `(dyn Callback<T> + 'static): Foo` is not satisfied
         (self.callback)(any(), any());
-        //~^ ERROR: the trait bound `(dyn Callback<T> + 'static): Foo` is not satisfied
-        //~| ERROR: expected function
     }
 }
 

tests/crashes/119692.rs

@@ -1,17 +1,17 @@
-//@ check-pass
-
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
 
 struct GenericStruct<const T: usize> { val: i64 }
 
 impl<const T: usize> From<GenericStruct<T>> for GenericStruct<{T + 1}> {
+//~^ ERROR: conflicting implementations of trait `From<GenericStruct<_>>` for type `GenericStruct<_>`
     fn from(other: GenericStruct<T>) -> Self {
         Self { val: other.val }
     }
 }
 
 impl<const T: usize> From<GenericStruct<{T + 1}>> for GenericStruct<T> {
+//~^ ERROR: conflicting implementations of trait `From<GenericStruct<_>>` for type `GenericStruct<_>`
     fn from(other: GenericStruct<{T + 1}>) -> Self {
         Self { val: other.val }
     }

tests/crashes/136859.rs

@@ -0,0 +1,21 @@
+error[E0119]: conflicting implementations of trait `From<GenericStruct<_>>` for type `GenericStruct<_>`
+  --> $DIR/issue-89304.rs:6:1
+   |
+LL | impl<const T: usize> From<GenericStruct<T>> for GenericStruct<{T + 1}> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: conflicting implementation in crate `core`:
+           - impl<T> From<T> for T;
+
+error[E0119]: conflicting implementations of trait `From<GenericStruct<_>>` for type `GenericStruct<_>`
+  --> $DIR/issue-89304.rs:13:1
+   |
+LL | impl<const T: usize> From<GenericStruct<{T + 1}>> for GenericStruct<T> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: conflicting implementation in crate `core`:
+           - impl<T> From<T> for T;
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0119`.

…t-projection-with-unsatisfied-bound-2.rs tests/crashes/155761-1.rstests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs renamed to tests/crashes/155761-1.rs tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs renamed to tests/crashes/155761-1.rs

@@ -0,0 +1,22 @@
+//@compile-flags: -Znext-solver
+
+// Regression test for #151308
+
+#![feature(lazy_type_alias)]
+trait Trait {
+    type Associated;
+}
+
+trait Generic<T> {}
+
+type TraitObject = dyn Generic<<i32 as Trait>::Associated>;
+//~^ ERROR: the trait bound `i32: Trait` is not satisfied
+
+struct Wrap(TraitObject);
+//~^ ERROR: the trait bound `i32: Trait` is not satisfied
+
+fn cast(x: *mut Wrap) {
+    x as *mut Wrap;
+}
+
+fn main() {}

tests/ui/const-generics/issues/issue-89304.rs

@@ -0,0 +1,27 @@
+error[E0277]: the trait bound `i32: Trait` is not satisfied
+  --> $DIR/dont-ice-on-normalization-failure.rs:12:32
+   |
+LL | type TraitObject = dyn Generic<<i32 as Trait>::Associated>;
+   |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `i32`
+   |
+help: this trait has no implementations, consider adding one
+  --> $DIR/dont-ice-on-normalization-failure.rs:6:1
+   |
+LL | trait Trait {
+   | ^^^^^^^^^^^
+
+error[E0277]: the trait bound `i32: Trait` is not satisfied
+  --> $DIR/dont-ice-on-normalization-failure.rs:15:13
+   |
+LL | struct Wrap(TraitObject);
+   |             ^^^^^^^^^^^ the trait `Trait` is not implemented for `i32`
+   |
+help: this trait has no implementations, consider adding one
+  --> $DIR/dont-ice-on-normalization-failure.rs:6:1
+   |
+LL | trait Trait {
+   | ^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.