Fix tests

Author: Randl

tests/ui/consts/const-try-feature-gate.stderr

@@ -5,7 +5,7 @@ LL |     Some(())?;
    |     ^^^^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-   = note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
+   = note: see issue #143874 <https://github.com/rust-lang/rust/issues/143874> for more information
    = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
@@ -27,7 +27,7 @@ LL |     Some(())?;
    |     ^^^^^^^^^
    |
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-   = note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
+   = note: see issue #143874 <https://github.com/rust-lang/rust/issues/143874> for more information
    = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 

tests/ui/consts/const-try.rs

@@ -1,5 +1,4 @@
-//@ run-pass
-//@ compile-flags: -Znext-solver
+//@ check-pass
 
 // Demonstrates what's needed to make use of `?` in const contexts.
 
@@ -14,14 +13,12 @@ struct TryMe;
 struct Error;
 
 impl const FromResidual<Error> for TryMe {
-    //~^ ERROR const `impl` for trait `FromResidual` which is not `const`
     fn from_residual(residual: Error) -> Self {
         TryMe
     }
 }
 
 impl const Try for TryMe {
-    //~^ ERROR const `impl` for trait `Try` which is not `const`
     type Output = ();
     type Residual = Error;
     fn from_output(output: Self::Output) -> Self {
@@ -34,8 +31,6 @@ impl const Try for TryMe {
 
 const fn t() -> TryMe {
     TryMe?;
-    //~^ ERROR `?` is not allowed on
-    //~| ERROR `?` is not allowed on
     TryMe
 }
 

tests/ui/consts/const-try.stderr

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(dead_code)]
 #![feature(const_trait_impl)]

tests/ui/consts/control-flow/try.rs

@@ -11,10 +11,11 @@ impl<T> From<T> for T {
 
 struct S;
 
-impl From<S> for S { //~ ERROR  conflicting implementations of trait `From<S>` for type `S`
-    fn from(s: S) -> S {
+impl From<S> for S {
+    fn from(s: S) -> S { //~ ERROR `from` specializes an item from a parent `impl`, but that item is not marked `default`
         s
     }
 }
 
+
 fn main() {}

tests/ui/specialization/issue-111232.rs

@@ -1,12 +1,14 @@
-error[E0119]: conflicting implementations of trait `From<S>` for type `S`
-  --> $DIR/issue-111232.rs:5:1
+error[E0520]: `from` specializes an item from a parent `impl`, but that item is not marked `default`
+  --> $DIR/issue-111232.rs:15:5
    |
-LL | impl From<S> for S {
-   | ^^^^^^^^^^^^^^^^^^
+LL | impl<T> From<T> for T {
+   | --------------------- parent `impl` is here
+...
+LL |     fn from(s: S) -> S {
+   |     ^^^^^^^^^^^^^^^^^^ cannot specialize default item `from`
    |
-   = note: conflicting implementation in crate `core`:
-           - impl<T> From<T> for T;
+   = note: to specialize, `from` in the parent `impl` must be marked `default`
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0119`.
+For more information about this error, try `rustc --explain E0520`.

tests/ui/specialization/issue-111232.stderr

@@ -1,4 +1,3 @@
-// tests/const_conversion_tests.rs
 #![feature(const_trait_impl,f16, f128)]
 #![feature(ascii_char, ascii_char_variants)]
 

tests/ui/traits/const-traits/const-from.rs

@@ -1,11 +1,11 @@
 error[E0277]: the trait bound `String: const From<&str>` is not satisfied
-  --> $DIR/const-from.rs:29:18
+  --> $DIR/const-from.rs:28:18
    |
 LL |     let mut st = String::from("world");
    |                  ^^^^^^
 
 error[E0599]: the method `as_ref` exists for reference `&u8`, but its trait bounds were not satisfied
-  --> $DIR/const-from.rs:34:25
+  --> $DIR/const-from.rs:33:25
    |
 LL |     let _: &u8      = x.as_ref();
    |                         ^^^^^^ method cannot be called on `&u8` due to unsatisfied trait bounds
@@ -15,7 +15,7 @@ LL |     let _: &u8      = x.as_ref();
            which is required by `&u8: AsRef<_>`
 
 error[E0599]: the method `as_mut` exists for mutable reference `&mut u8`, but its trait bounds were not satisfied
-  --> $DIR/const-from.rs:38:26
+  --> $DIR/const-from.rs:37:26
    |
 LL |     let _: &mut u8  = ym.as_mut();
    |                          ^^^^^^ method cannot be called on `&mut u8` due to unsatisfied trait bounds
@@ -25,13 +25,13 @@ LL |     let _: &mut u8  = ym.as_mut();
            which is required by `&mut u8: AsMut<_>`
 
 error[E0277]: the trait bound `[u8; 3]: const AsRef<[u8]>` is not satisfied
-  --> $DIR/const-from.rs:42:24
+  --> $DIR/const-from.rs:41:24
    |
 LL |     let _: &[u8] = arr.as_ref();
    |                        ^^^^^^
 
 error[E0277]: the trait bound `[u8; 3]: const AsMut<[u8]>` is not satisfied
-  --> $DIR/const-from.rs:45:29
+  --> $DIR/const-from.rs:44:29
    |
 LL |     let _: &mut [u8] = arr2.as_mut();
    |                             ^^^^^^