Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Windows: Remove some unnecessary type aliases #127712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jul 15, 2024
Merged

Windows: Remove some unnecessary type aliases #127712

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1d1cae1
Remove NonZeroDWORD
ChrisDenton Jul 14, 2024
91ba4eb
Remove LARGE_INTEGER
ChrisDenton Jul 14, 2024
65da4af
Remove LONG
ChrisDenton Jul 14, 2024
b107cfa
Remove UINT
ChrisDenton Jul 14, 2024
e70cc28
Remove LPWSTR
ChrisDenton Jul 14, 2024
f2cc943
Remove USHORT
ChrisDenton Jul 14, 2024
5b700a7
Remove CHAR
ChrisDenton Jul 14, 2024
286c327
Remove SIZE_T
ChrisDenton Jul 14, 2024
8052fb8
Remove LPCVOID
ChrisDenton Jul 14, 2024
1b7cf3a
Remove LPOVERLAPPED
ChrisDenton Jul 14, 2024
351f1f3
Remove LPSECURITY_ATTRIBUTES
ChrisDenton Jul 14, 2024
84dd7e4
Remove LPVOID
ChrisDenton Jul 14, 2024
21f69b5
Remove PSRWLOCK
ChrisDenton Jul 14, 2024
d8d7c5c
Remove ULONG
ChrisDenton Jul 14, 2024
e2b062c
Remove DWORD
ChrisDenton Jul 14, 2024
8a1ce3d
Make normalization regex less exact
ChrisDenton Jul 14, 2024
ffe8fc2
Don't re-export `c_int` from `c`
ChrisDenton Jul 14, 2024
816d90a
Fix Windows 7
ChrisDenton Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't re-export c_int from c
  • Loading branch information
@ChrisDenton
ChrisDenton committed Jul 15, 2024
commit ffe8fc276ea593d0e1b9c8aee6edb71a53190a43
3 changes: 1 addition & 2 deletions library/std/src/sys/pal/windows/c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

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

Expand Down
12 changes: 6 additions & 6 deletions library/std/src/sys/pal/windows/stdio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ fn write_valid_utf8_to_console(handle: c::HANDLE, utf8: &str) -> io::Result<usiz
c::CP_UTF8, // CodePage
c::MB_ERR_INVALID_CHARS, // dwFlags
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.len() as c::c_int, // cchWideChar
utf16.len() as i32, // cchWideChar
);
assert!(result != 0, "Unexpected error in MultiByteToWideChar");

Expand Down Expand Up @@ -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> {
debug_assert!(utf16.len() <= c::c_int::MAX as usize);
debug_assert!(utf8.len() <= c::c_int::MAX as usize);
debug_assert!(utf16.len() <= i32::MAX as usize);
debug_assert!(utf8.len() <= i32::MAX as usize);

if utf16.is_empty() {
return Ok(0);
Expand All @@ -386,9 +386,9 @@ fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result<usize> {
c::CP_UTF8, // CodePage
c::WC_ERR_INVALID_CHARS, // dwFlags
utf16.as_ptr(), // lpWideCharStr
utf16.len() as c::c_int, // cchWideChar
utf16.len() as i32, // cchWideChar
utf8.as_mut_ptr(), // lpMultiByteStr
utf8.len() as c::c_int, // cbMultiByte
utf8.len() as i32, // cbMultiByte
ptr::null(), // lpDefaultChar
ptr::null_mut(), // lpUsedDefaultChar
)
Expand Down