Update existing UI tests

Author: fmease

tests/ui/object-safety/assoc_const_bounds.rs

@@ -1,7 +1,13 @@
+#![feature(generic_consts)]
+#![allow(incomplete_features, dead_code)]
+
+// FIXME(generic_consts): Is this the expected behavior? #110590 #112319
+// check-pass
+
 trait Foo<T> {
     const BAR: bool
-        where //~ ERROR: expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `=`, found keyword `where`
-            Self: Sized;
+    where
+        Self: Sized;
 }
 
 trait Cake {}

tests/ui/object-safety/assoc_const_bounds.stderr

@@ -1,7 +1,13 @@
+#![feature(generic_consts)]
+#![allow(incomplete_features, dead_code)]
+
+// FIXME(generic_consts): Is this the expected behavior? #110590 #112319
+// check-pass
+
 trait Foo {
     const BAR: bool
-        where //~ ERROR: expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `=`, found keyword `where`
-            Self: Sized;
+    where
+        Self: Sized;
 }
 
 fn foo(_: &dyn Foo) {}

tests/ui/object-safety/assoc_const_bounds_sized.rs

@@ -3,8 +3,9 @@ struct S;
 impl S {
     static fn f() {}
     //~^ ERROR expected identifier, found keyword `fn`
-    //~| ERROR expected one of `:`, `;`, or `=`
+    //~| ERROR expected one of `:`, `;`, `<`, `=`, or `where`
     //~| ERROR missing type for `static` item
+    // FIXME(generic_consts): `<` and `where` now being in the list of expected tokens isn't great.
 }
 
 fn main() {}

tests/ui/object-safety/assoc_const_bounds_sized.stderr

@@ -4,13 +4,13 @@ error: expected identifier, found keyword `fn`
 LL |     static fn f() {}
    |            ^^ expected identifier, found keyword
 
-error: expected one of `:`, `;`, or `=`, found `f`
+error: expected one of `:`, `;`, `<`, `=`, or `where`, found `f`
   --> $DIR/removed-syntax-static-fn.rs:4:15
    |
 LL | impl S {
    |        - while parsing this item list starting here
 LL |     static fn f() {}
-   |               ^ expected one of `:`, `;`, or `=`
+   |               ^ expected one of `:`, `;`, `<`, `=`, or `where`
 ...
 LL | }
    | - the item list ends here

tests/ui/parser/removed-syntax-static-fn.rs

@@ -3,6 +3,8 @@ trait ZstAssert: Sized {
     const B: S = S { s: &() }; //~ ERROR missing lifetime specifier
     const C: &'_ str = ""; //~ ERROR missing lifetime specifier
     const D: T = T { a: &(), b: &() }; //~ ERROR missing lifetime specifier
+    // FIXME(generic_consts): We should only suggest adding lifetime parameters to assoc consts if
+    // the feature `generic_consts` is enabled. If it isn't, suggest adding it to the trait.
 }
 
 struct S<'a> {

tests/ui/parser/removed-syntax-static-fn.stderr

@@ -6,9 +6,8 @@ LL |     const A: &str = "";
    |
 help: consider introducing a named lifetime parameter
    |
-LL ~ trait ZstAssert<'a>: Sized {
-LL ~     const A: &'a str = "";
-   |
+LL |     const A<'a>: &'a str = "";
+   |            ++++   ++
 
 error[E0106]: missing lifetime specifier
   --> $DIR/missing-lifetime-in-assoc-const-type.rs:3:14
@@ -18,10 +17,8 @@ LL |     const B: S = S { s: &() };
    |
 help: consider introducing a named lifetime parameter
    |
-LL ~ trait ZstAssert<'a>: Sized {
-LL |     const A: &str = "";
-LL ~     const B: S<'a> = S { s: &() };
-   |
+LL |     const B<'a>: S<'a> = S { s: &() };
+   |            ++++   ++++
 
 error[E0106]: missing lifetime specifier
   --> $DIR/missing-lifetime-in-assoc-const-type.rs:4:15
@@ -31,11 +28,8 @@ LL |     const C: &'_ str = "";
    |
 help: consider introducing a named lifetime parameter
    |
-LL ~ trait ZstAssert<'a>: Sized {
-LL |     const A: &str = "";
-LL |     const B: S = S { s: &() };
-LL ~     const C: &'a str = "";
-   |
+LL |     const C<'a>: &'a str = "";
+   |            ++++   ~~
 
 error[E0106]: missing lifetime specifiers
   --> $DIR/missing-lifetime-in-assoc-const-type.rs:5:14
@@ -45,12 +39,8 @@ LL |     const D: T = T { a: &(), b: &() };
    |
 help: consider introducing a named lifetime parameter
    |
-LL ~ trait ZstAssert<'a>: Sized {
-LL |     const A: &str = "";
-LL |     const B: S = S { s: &() };
-LL |     const C: &'_ str = "";
-LL ~     const D: T<'a, 'a> = T { a: &(), b: &() };
-   |
+LL |     const D<'a>: T<'a, 'a> = T { a: &(), b: &() };
+   |            ++++   ++++++++
 
 error: aborting due to 4 previous errors