Don't re-export c_int from c · model-checking/verify-rust-std@decdb06 (original) (raw)

`@@ -181,9 +181,9 @@ fn write_valid_utf8_to_console(handle: c::HANDLE, utf8: &str) -> io::Result<usiz

`

181

181

` c::CP_UTF8, // CodePage

`

182

182

` c::MB_ERR_INVALID_CHARS, // dwFlags

`

183

183

` utf8.as_ptr(), // lpMultiByteStr

`

184

``

`-

utf8.len() as c::c_int, // cbMultiByte

`

``

184

`+

utf8.len() as i32, // cbMultiByte

`

185

185

` utf16.as_mut_ptr() as *mut c::WCHAR, // lpWideCharStr

`

186

``

`-

utf16.len() as c::c_int, // cchWideChar

`

``

186

`+

utf16.len() as i32, // cchWideChar

`

187

187

`);

`

188

188

`assert!(result != 0, "Unexpected error in MultiByteToWideChar");

`

189

189

``

`@@ -374,8 +374,8 @@ fn read_u16s(handle: c::HANDLE, buf: &mut [MaybeUninit]) -> io::Result<usiz

`

374

374

`}

`

375

375

``

376

376

`fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result {

`

377

``

`-

debug_assert!(utf16.len() <= c::c_int::MAX as usize);

`

378

``

`-

debug_assert!(utf8.len() <= c::c_int::MAX as usize);

`

``

377

`+

debug_assert!(utf16.len() <= i32::MAX as usize);

`

``

378

`+

debug_assert!(utf8.len() <= i32::MAX as usize);

`

379

379

``

380

380

`if utf16.is_empty() {

`

381

381

`return Ok(0);

`

`@@ -386,9 +386,9 @@ fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result {

`

386

386

` c::CP_UTF8, // CodePage

`

387

387

` c::WC_ERR_INVALID_CHARS, // dwFlags

`

388

388

` utf16.as_ptr(), // lpWideCharStr

`

389

``

`-

utf16.len() as c::c_int, // cchWideChar

`

``

389

`+

utf16.len() as i32, // cchWideChar

`

390

390

` utf8.as_mut_ptr(), // lpMultiByteStr

`

391

``

`-

utf8.len() as c::c_int, // cbMultiByte

`

``

391

`+

utf8.len() as i32, // cbMultiByte

`

392

392

` ptr::null(), // lpDefaultChar

`

393

393

` ptr::null_mut(), // lpUsedDefaultChar

`

394

394

`)

`