bless the tests and add a new one

Author: Orion Gonzalez

compiler/rustc_hir_typeck/src/errors.rs

@@ -800,6 +800,8 @@ pub(crate) struct PassToVariadicFunction<'a, 'tcx> {
 
 #[derive(Diagnostic)]
 #[diag(hir_typeck_fn_item_to_variadic_function, code = E0617)]
+#[help]
+#[note]
 pub(crate) struct PassFnItemToVariadicFunction {
     #[primary_span]
     pub span: Span,

tests/ui/c-variadic/fn-item-diagnostic-issue-69232.rs

@@ -0,0 +1,13 @@
+// https://github.com/rust-lang/rust/issues/69232
+
+extern "C" {
+    fn foo(x: usize, ...);
+}
+
+fn test() -> u8 {
+    127
+}
+
+fn main() {
+    unsafe { foo(1, test) }; //~ ERROR can't pass a function item to a variadic function
+}

tests/ui/c-variadic/fn-item-diagnostic-issue-69232.stderr

@@ -0,0 +1,12 @@
+error[E0617]: can't pass a function item to a variadic function
+  --> $DIR/fn-item-diagnostic-issue-69232.rs:12:21
+   |
+LL |     unsafe { foo(1, test) };
+   |                     ^^^^- help: use a function pointer instead: `as fn() -> u8`
+   |
+   = help: a function item is zero-sized and needs to be cast into a function pointer to be used in FFI
+   = note: for more information on function items, visit https://doc.rust-lang.org/reference/types/function-item.html
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0617`.

tests/ui/c-variadic/issue-32201.rs

@@ -7,7 +7,8 @@ fn bar(_: *const u8) {}
 fn main() {
     unsafe {
         foo(0, bar);
-        //~^ ERROR can't pass `fn(*const u8) {bar}` to variadic function
-        //~| HELP cast the value to `fn(*const u8)`
+        //~^ ERROR can't pass a function item to a variadic function
+        //~| HELP a function item is zero-sized and needs to be cast into a function pointer to be used in FFI
+        ////~| HELP use a function pointer instead
     }
 }

tests/ui/c-variadic/issue-32201.stderr

@@ -1,8 +1,11 @@
-error[E0617]: can't pass `fn(*const u8) {bar}` to variadic function
+error[E0617]: can't pass a function item to a variadic function
   --> $DIR/issue-32201.rs:9:16
    |
 LL |         foo(0, bar);
-   |                ^^^ help: cast the value to `fn(*const u8)`: `bar as fn(*const u8)`
+   |                ^^^- help: use a function pointer instead: `as fn(*const u8)`
+   |
+   = help: a function item is zero-sized and needs to be cast into a function pointer to be used in FFI
+   = note: for more information on function items, visit https://doc.rust-lang.org/reference/types/function-item.html
 
 error: aborting due to 1 previous error
 

tests/ui/error-codes/E0617.rs

@@ -20,7 +20,8 @@ fn main() {
         //~^ ERROR can't pass `u16` to variadic function
         //~| HELP cast the value to `c_uint`
         printf(::std::ptr::null(), printf);
-        //~^ ERROR can't pass `unsafe extern "C" fn(*const i8, ...) {printf}` to variadic function
-        //~| HELP cast the value to `unsafe extern "C" fn(*const i8, ...)`
+        //~^ ERROR can't pass a function item to a variadic function
+        //~| HELP a function item is zero-sized and needs to be cast into a function pointer to be used in FFI
+        //~| HELP use a function pointer instead
     }
 }

tests/ui/error-codes/E0617.stderr

@@ -28,16 +28,14 @@ error[E0617]: can't pass `u16` to variadic function
 LL |         printf(::std::ptr::null(), 0u16);
    |                                    ^^^^ help: cast the value to `c_uint`: `0u16 as c_uint`
 
-error[E0617]: can't pass `unsafe extern "C" fn(*const i8, ...) {printf}` to variadic function
+error[E0617]: can't pass a function item to a variadic function
   --> $DIR/E0617.rs:22:36
    |
 LL |         printf(::std::ptr::null(), printf);
-   |                                    ^^^^^^
+   |                                    ^^^^^^- help: use a function pointer instead: `as unsafe extern "C" fn(*const i8, ...)`
    |
-help: cast the value to `unsafe extern "C" fn(*const i8, ...)`
-   |
-LL |         printf(::std::ptr::null(), printf as unsafe extern "C" fn(*const i8, ...));
-   |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   = help: a function item is zero-sized and needs to be cast into a function pointer to be used in FFI
+   = note: for more information on function items, visit https://doc.rust-lang.org/reference/types/function-item.html
 
 error: aborting due to 6 previous errors