user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #133620 - dev-ardi:simplify-hir_typeck_pass_to_variadic_function, r=compiler-errors

Browse source 
Simplify hir_typeck_pass_to_variadic_function

r? ``@compiler-errors``
This reworks a bit how the diagnostic is generated so that it does the same as #133538

The `help` is useless now so I removed it
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-11-30 12:56:54 +08:00 • committed by GitHub
commit c112195fec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 69 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/ui/c-variadic/variadic-ffi-1.stderr
View file

@ -62,37 +62,67 @@ error[E0617]: can't pass `f32` to variadic function
--> $DIR/variadic-ffi-1.rs:28:19
|
LL | foo(1, 2, 3f32);
| ^^^^ help: cast the value to `c_double`: `3f32 as c_double`
| ^^^^
|
help: cast the value to `c_double`
|
LL | foo(1, 2, 3f32 as c_double);
| +++++++++++
error[E0617]: can't pass `bool` to variadic function
--> $DIR/variadic-ffi-1.rs:29:19
|
LL | foo(1, 2, true);
| ^^^^ help: cast the value to `c_int`: `true as c_int`
| ^^^^
|
help: cast the value to `c_int`
|
LL | foo(1, 2, true as c_int);
| ++++++++
error[E0617]: can't pass `i8` to variadic function
--> $DIR/variadic-ffi-1.rs:30:19
|
LL | foo(1, 2, 1i8);
| ^^^ help: cast the value to `c_int`: `1i8 as c_int`
| ^^^
|
help: cast the value to `c_int`
|
LL | foo(1, 2, 1i8 as c_int);
| ++++++++
error[E0617]: can't pass `u8` to variadic function
--> $DIR/variadic-ffi-1.rs:31:19
|
LL | foo(1, 2, 1u8);
| ^^^ help: cast the value to `c_uint`: `1u8 as c_uint`
| ^^^
|
help: cast the value to `c_uint`
|
LL | foo(1, 2, 1u8 as c_uint);
| +++++++++
error[E0617]: can't pass `i16` to variadic function
--> $DIR/variadic-ffi-1.rs:32:19
|
LL | foo(1, 2, 1i16);
| ^^^^ help: cast the value to `c_int`: `1i16 as c_int`
| ^^^^
|
help: cast the value to `c_int`
|
LL | foo(1, 2, 1i16 as c_int);
| ++++++++
error[E0617]: can't pass `u16` to variadic function
--> $DIR/variadic-ffi-1.rs:33:19
|
LL | foo(1, 2, 1u16);
| ^^^^ help: cast the value to `c_uint`: `1u16 as c_uint`
| ^^^^
|
help: cast the value to `c_uint`
|
LL | foo(1, 2, 1u16 as c_uint);
| +++++++++
error: aborting due to 11 previous errors

35
tests/ui/error-codes/E0617.stderr
View file

@ -2,31 +2,56 @@ error[E0617]: can't pass `f32` to variadic function
--> $DIR/E0617.rs:7:36
|
LL | printf(::std::ptr::null(), 0f32);
| ^^^^ help: cast the value to `c_double`: `0f32 as c_double`
| ^^^^
|
help: cast the value to `c_double`
|
LL | printf(::std::ptr::null(), 0f32 as c_double);
| +++++++++++
error[E0617]: can't pass `i8` to variadic function
--> $DIR/E0617.rs:10:36
|
LL | printf(::std::ptr::null(), 0i8);
| ^^^ help: cast the value to `c_int`: `0i8 as c_int`
| ^^^
|
help: cast the value to `c_int`
|
LL | printf(::std::ptr::null(), 0i8 as c_int);
| ++++++++
error[E0617]: can't pass `i16` to variadic function
--> $DIR/E0617.rs:13:36
|
LL | printf(::std::ptr::null(), 0i16);
| ^^^^ help: cast the value to `c_int`: `0i16 as c_int`
| ^^^^
|
help: cast the value to `c_int`
|
LL | printf(::std::ptr::null(), 0i16 as c_int);
| ++++++++
error[E0617]: can't pass `u8` to variadic function
--> $DIR/E0617.rs:16:36
|
LL | printf(::std::ptr::null(), 0u8);
| ^^^ help: cast the value to `c_uint`: `0u8 as c_uint`
| ^^^
|
help: cast the value to `c_uint`
|
LL | printf(::std::ptr::null(), 0u8 as c_uint);
| +++++++++
error[E0617]: can't pass `u16` to variadic function
--> $DIR/E0617.rs:19:36
|
LL | printf(::std::ptr::null(), 0u16);
| ^^^^ help: cast the value to `c_uint`: `0u16 as c_uint`
| ^^^^
|
help: cast the value to `c_uint`
|
LL | printf(::std::ptr::null(), 0u16 as c_uint);
| +++++++++
error[E0617]: can't pass a function item to a variadic function
--> $DIR/E0617.rs:22:36