nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't re-export c_int from c

Browse Source
This commit is contained in:
Chris Denton 2024-07-14 21:32:13 +00:00
parent 8a1ce3dfcc
commit ffe8fc276e
No known key found for this signature in database
GPG Key ID: 713472F2F45627DE
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/std/src/sys/pal/windows/c.rs
View File

@ -7,8 +7,7 @@
use crate::ffi::CStr; use crate::ffi::CStr;
use crate::mem; use crate::mem;
pub use crate::os::raw::c_int; use crate::os::raw::{c_char, c_int, c_uint, c_ulong, c_ushort, c_void};
use crate::os::raw::{c_char, c_uint, c_ulong, c_ushort, c_void};
use crate::os::windows::io::{AsRawHandle, BorrowedHandle}; use crate::os::windows::io::{AsRawHandle, BorrowedHandle};
use crate::ptr; use crate::ptr;

12
library/std/src/sys/pal/windows/stdio.rs
View File

@ -181,9 +181,9 @@ fn write_valid_utf8_to_console(handle: c::HANDLE, utf8: &str) -> io::Result<usiz
c::CP_UTF8, // CodePage c::CP_UTF8, // CodePage
c::MB_ERR_INVALID_CHARS, // dwFlags c::MB_ERR_INVALID_CHARS, // dwFlags
utf8.as_ptr(), // lpMultiByteStr utf8.as_ptr(), // lpMultiByteStr
utf8.len() as c::c_int, // cbMultiByte utf8.len() as i32, // cbMultiByte
utf16.as_mut_ptr() as *mut c::WCHAR, // lpWideCharStr utf16.as_mut_ptr() as *mut c::WCHAR, // lpWideCharStr
utf16.len() as c::c_int, // cchWideChar utf16.len() as i32, // cchWideChar
); );
assert!(result != 0, "Unexpected error in MultiByteToWideChar"); assert!(result != 0, "Unexpected error in MultiByteToWideChar");
@ -374,8 +374,8 @@ fn read_u16s(handle: c::HANDLE, buf: &mut [MaybeUninit<u16>]) -> io::Result<usiz
} }
fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result<usize> { fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result<usize> {
debug_assert!(utf16.len() <= c::c_int::MAX as usize); debug_assert!(utf16.len() <= i32::MAX as usize);
debug_assert!(utf8.len() <= c::c_int::MAX as usize); debug_assert!(utf8.len() <= i32::MAX as usize);
if utf16.is_empty() { if utf16.is_empty() {
return Ok(0); return Ok(0);
@ -386,9 +386,9 @@ fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result<usize> {
c::CP_UTF8, // CodePage c::CP_UTF8, // CodePage
c::WC_ERR_INVALID_CHARS, // dwFlags c::WC_ERR_INVALID_CHARS, // dwFlags
utf16.as_ptr(), // lpWideCharStr utf16.as_ptr(), // lpWideCharStr
utf16.len() as c::c_int, // cchWideChar utf16.len() as i32, // cchWideChar
utf8.as_mut_ptr(), // lpMultiByteStr utf8.as_mut_ptr(), // lpMultiByteStr
utf8.len() as c::c_int, // cbMultiByte utf8.len() as i32, // cbMultiByte
ptr::null(), // lpDefaultChar ptr::null(), // lpDefaultChar
ptr::null_mut(), // lpUsedDefaultChar ptr::null_mut(), // lpUsedDefaultChar
) )