bless the fallout

Author: bit-aloo

tests/ui/const-generics/fn-item-as-const-arg-137084.rs

@@ -7,8 +7,7 @@
 fn a<const b: i32>() {}
 fn d(e: &String) {
     a::<d>
-    //~^ ERROR mismatched types
-    //~| ERROR the constant `d` is not of type `i32`
+    //~^ ERROR function items cannot be used as const args
 }
 
 fn main() {}

tests/ui/const-generics/fn-item-as-const-arg-137084.stderr

@@ -1,35 +1,8 @@
-error[E0308]: mismatched types
-  --> $DIR/fn-item-as-const-arg-137084.rs:9:5
-   |
-LL | fn a<const b: i32>() {}
-   | -------------------- function `a` defined here
-LL | fn d(e: &String) {
-LL |     a::<d>
-   |     ^^^^^^ expected `()`, found fn item
-   |
-   = note: expected unit type `()`
-                found fn item `fn() {a::<d>}`
-help: try adding a return type
-   |
-LL | fn d(e: &String) -> fn() {
-   |                  +++++++
-help: use parentheses to call this function
-   |
-LL |     a::<d>()
-   |           ++
-
-error: the constant `d` is not of type `i32`
+error: function items cannot be used as const args
   --> $DIR/fn-item-as-const-arg-137084.rs:9:9
    |
 LL |     a::<d>
-   |         ^ expected `i32`, found fn item
-   |
-note: required by a const generic parameter in `a`
-  --> $DIR/fn-item-as-const-arg-137084.rs:7:6
-   |
-LL | fn a<const b: i32>() {}
-   |      ^^^^^^^^^^^^ required by this const generic parameter in `a`
+   |         ^
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0308`.

tests/ui/const-generics/ice-151186-fn-ptr-in-where-clause.rs

@@ -11,6 +11,6 @@ trait MyTrait<const F: fn() -> ()> {}
 fn foo<'a>(x: &'a ()) -> &'a () { x }
 
 impl<T> Maybe<T> for T where T: MyTrait<{ foo }> {}
-//~^ ERROR the constant `foo` is not of type `fn()`
+//~^ ERROR function items cannot be used as const args
 
 fn main() {}

tests/ui/const-generics/ice-151186-fn-ptr-in-where-clause.stderr

@@ -1,3 +1,9 @@
+error: function items cannot be used as const args
+  --> $DIR/ice-151186-fn-ptr-in-where-clause.rs:13:43
+   |
+LL | impl<T> Maybe<T> for T where T: MyTrait<{ foo }> {}
+   |                                           ^^^
+
 error: using function pointers as const generic parameters is forbidden
   --> $DIR/ice-151186-fn-ptr-in-where-clause.rs:8:24
    |
@@ -6,17 +12,5 @@ LL | trait MyTrait<const F: fn() -> ()> {}
    |
    = note: the only supported types are integers, `bool`, and `char`
 
-error: the constant `foo` is not of type `fn()`
-  --> $DIR/ice-151186-fn-ptr-in-where-clause.rs:13:33
-   |
-LL | impl<T> Maybe<T> for T where T: MyTrait<{ foo }> {}
-   |                                 ^^^^^^^^^^^^^^^^ expected fn pointer, found fn item
-   |
-note: required by a const generic parameter in `MyTrait`
-  --> $DIR/ice-151186-fn-ptr-in-where-clause.rs:8:15
-   |
-LL | trait MyTrait<const F: fn() -> ()> {}
-   |               ^^^^^^^^^^^^^^^^^^^ required by this const generic parameter in `MyTrait`
-
 error: aborting due to 2 previous errors
 

tests/ui/const-generics/mgca/bad-impl-trait-with-apit.rs

@@ -6,7 +6,7 @@
 trait Trait {}
 
 impl<'t> Trait for [(); N] {}
-//~^ ERROR the placeholder `_` is not allowed within types on item signatures for implementations
+//~^ ERROR function items cannot be used as const args
 
 fn N(arg: impl Trait) {}
 

tests/ui/const-generics/mgca/bad-impl-trait-with-apit.stderr

@@ -1,9 +1,8 @@
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for implementations
+error: function items cannot be used as const args
   --> $DIR/bad-impl-trait-with-apit.rs:8:25
    |
 LL | impl<'t> Trait for [(); N] {}
-   |                         ^ not allowed in type signatures
+   |                         ^
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0121`.

tests/ui/const-generics/mgca/missing_generic_params.rs

@@ -11,6 +11,6 @@
 #![allow(incomplete_features)]
 trait Trait {}
 impl Trait for [(); N] {}
-//~^ ERROR: missing generics for function `N`
+//~^ ERROR function items cannot be used as const args
 fn N<T>() {}
 pub fn main() {}

tests/ui/const-generics/mgca/missing_generic_params.stderr

@@ -1,19 +1,8 @@
-error[E0107]: missing generics for function `N`
+error: function items cannot be used as const args
   --> $DIR/missing_generic_params.rs:13:21
    |
 LL | impl Trait for [(); N] {}
-   |                     ^ expected 1 generic argument
-   |
-note: function defined here, with 1 generic parameter: `T`
-  --> $DIR/missing_generic_params.rs:15:4
-   |
-LL | fn N<T>() {}
-   |    ^ -
-help: add missing generic argument
-   |
-LL | impl Trait for [(); N<T>] {}
-   |                      +++
+   |                     ^
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0107`.

tests/ui/const-generics/mgca/size-of-generic-ptr-in-array-len.rs

@@ -4,7 +4,8 @@
 
 fn foo<T>() {
     [0; size_of::<*mut T>()];
-    //~^ ERROR: complex const arguments must be placed inside of a `const` block
+    //~^ ERROR function items cannot be used as const args
+    //~| ERROR tuple constructor with invalid base path
     [0; const { size_of::<*mut T>() }];
     //~^ ERROR: generic parameters may not be used in const operations
     [0; const { size_of::<*mut i32>() }];

tests/ui/const-generics/mgca/size-of-generic-ptr-in-array-len.stderr

@@ -1,16 +1,22 @@
-error: complex const arguments must be placed inside of a `const` block
+error: function items cannot be used as const args
+  --> $DIR/size-of-generic-ptr-in-array-len.rs:6:9
+   |
+LL |     [0; size_of::<*mut T>()];
+   |         ^^^^^^^^^^^^^^^^^
+
+error: tuple constructor with invalid base path
   --> $DIR/size-of-generic-ptr-in-array-len.rs:6:9
    |
 LL |     [0; size_of::<*mut T>()];
    |         ^^^^^^^^^^^^^^^^^^^
 
 error: generic parameters may not be used in const operations
-  --> $DIR/size-of-generic-ptr-in-array-len.rs:8:32
+  --> $DIR/size-of-generic-ptr-in-array-len.rs:9:32
    |
 LL |     [0; const { size_of::<*mut T>() }];
    |                                ^
    |
    = help: add `#![feature(generic_const_args)]` and extract the expression into a `type const` item
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors