Support nightly 2026-05-24

This commit is contained in:
Jeremy Soller
2026-05-25 17:03:17 -06:00
parent 7b3371848c
commit ffa097ccb3
15 changed files with 90 additions and 109 deletions
+18 -34
View File
@@ -1406,12 +1406,8 @@ pub unsafe extern "C" fn vfprintf(file: *mut FILE, format: *const c_char, ap: va
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn fprintf(
file: *mut FILE,
format: *const c_char,
mut __valist: ...
) -> c_int {
unsafe { vfprintf(file, format, __valist.as_va_list()) }
pub unsafe extern "C" fn fprintf(file: *mut FILE, format: *const c_char, __valist: ...) -> c_int {
unsafe { vfprintf(file, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vdprintf.html>.
@@ -1428,8 +1424,8 @@ pub unsafe extern "C" fn vdprintf(fd: c_int, format: *const c_char, ap: va_list)
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dprintf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn dprintf(fd: c_int, format: *const c_char, mut __valist: ...) -> c_int {
unsafe { vdprintf(fd, format, __valist.as_va_list()) }
pub unsafe extern "C" fn dprintf(fd: c_int, format: *const c_char, __valist: ...) -> c_int {
unsafe { vdprintf(fd, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
@@ -1440,8 +1436,8 @@ pub unsafe extern "C" fn vprintf(format: *const c_char, ap: va_list) -> c_int {
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn printf(format: *const c_char, mut __valist: ...) -> c_int {
unsafe { vfprintf(&raw mut *stdout, format, __valist.as_va_list()) }
pub unsafe extern "C" fn printf(format: *const c_char, __valist: ...) -> c_int {
unsafe { vfprintf(&raw mut *stdout, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
@@ -1464,9 +1460,9 @@ pub unsafe extern "C" fn vasprintf(
pub unsafe extern "C" fn asprintf(
strp: *mut *mut c_char,
format: *const c_char,
mut __valist: ...
__valist: ...
) -> c_int {
unsafe { vasprintf(strp, format, __valist.as_va_list()) }
unsafe { vasprintf(strp, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
@@ -1492,13 +1488,13 @@ pub unsafe extern "C" fn snprintf(
s: *mut c_char,
n: size_t,
format: *const c_char,
mut __valist: ...
__valist: ...
) -> c_int {
unsafe {
printf::printf(
&mut platform::StringWriter(s, n),
CStr::from_ptr(format),
__valist.as_va_list(),
__valist,
)
}
}
@@ -1517,16 +1513,12 @@ pub unsafe extern "C" fn vsprintf(s: *mut c_char, format: *const c_char, ap: va_
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn sprintf(
s: *mut c_char,
format: *const c_char,
mut __valist: ...
) -> c_int {
pub unsafe extern "C" fn sprintf(s: *mut c_char, format: *const c_char, __valist: ...) -> c_int {
unsafe {
printf::printf(
&mut platform::UnsafeStringWriter(s.cast::<u8>()),
CStr::from_ptr(format),
__valist.as_va_list(),
__valist,
)
}
}
@@ -1549,12 +1541,8 @@ pub unsafe extern "C" fn vfscanf(file: *mut FILE, format: *const c_char, ap: va_
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn fscanf(
file: *mut FILE,
format: *const c_char,
mut __valist: ...
) -> c_int {
unsafe { vfscanf(file, format, __valist.as_va_list()) }
pub unsafe extern "C" fn fscanf(file: *mut FILE, format: *const c_char, __valist: ...) -> c_int {
unsafe { vfscanf(file, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfscanf.html>.
@@ -1565,8 +1553,8 @@ pub unsafe extern "C" fn vscanf(format: *const c_char, ap: va_list) -> c_int {
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn scanf(format: *const c_char, mut __valist: ...) -> c_int {
unsafe { vfscanf(&raw mut *stdin, format, __valist.as_va_list()) }
pub unsafe extern "C" fn scanf(format: *const c_char, __valist: ...) -> c_int {
unsafe { vfscanf(&raw mut *stdin, format, __valist) }
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfscanf.html>.
@@ -1581,15 +1569,11 @@ pub unsafe extern "C" fn vsscanf(s: *const c_char, format: *const c_char, ap: va
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn sscanf(
s: *const c_char,
format: *const c_char,
mut __valist: ...
) -> c_int {
pub unsafe extern "C" fn sscanf(s: *const c_char, format: *const c_char, __valist: ...) -> c_int {
unsafe {
let format = CStr::from_ptr(format);
let s = CStr::from_ptr(s);
scanf::scanf(s.into(), format.into(), __valist.as_va_list())
scanf::scanf(s.into(), format.into(), __valist)
}
}