diff options
| author | Trevor Gross <tmgross@umich.edu> | 2025-07-18 17:35:57 +0000 |
|---|---|---|
| committer | Trevor Gross <tmgross@umich.edu> | 2025-07-18 17:35:57 +0000 |
| commit | 7dacaef5d3c252ea47287ce34234a89e3c5ff57e (patch) | |
| tree | 199f718e9771290d7a4a189e0ef1950f9ea90e3f | |
| parent | d963c78140a9636810e7ffd0c50022b23be902cb (diff) | |
| download | rust-7dacaef5d3c252ea47287ce34234a89e3c5ff57e.tar.gz rust-7dacaef5d3c252ea47287ce34234a89e3c5ff57e.zip | |
mem: Use `core::ffi::c_int`
This alias was added in 9897bfb8a ("Fix memset arguments for MSP430
target"), which predates `core::ffi`. Now that it exists we can just use
`core::ffi::c_int`.
| -rw-r--r-- | library/compiler-builtins/compiler-builtins/src/mem/mod.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/library/compiler-builtins/compiler-builtins/src/mem/mod.rs b/library/compiler-builtins/compiler-builtins/src/mem/mod.rs index 6828f3804e0..a6f533cb725 100644 --- a/library/compiler-builtins/compiler-builtins/src/mem/mod.rs +++ b/library/compiler-builtins/compiler-builtins/src/mem/mod.rs @@ -3,13 +3,6 @@ // FIXME(e2024): this eventually needs to be removed. #![allow(unsafe_op_in_unsafe_fn)] -#[allow(warnings)] -#[cfg(target_pointer_width = "16")] -type c_int = i16; -#[allow(warnings)] -#[cfg(not(target_pointer_width = "16"))] -type c_int = i32; - // memcpy/memmove/memset have optimized implementations on some architectures #[cfg_attr( all(not(feature = "no-asm"), target_arch = "x86_64"), @@ -38,7 +31,7 @@ intrinsics! { } #[mem_builtin] - pub unsafe extern "C" fn memset(s: *mut u8, c: crate::mem::c_int, n: usize) -> *mut u8 { + pub unsafe extern "C" fn memset(s: *mut u8, c: core::ffi::c_int, n: usize) -> *mut u8 { impls::set_bytes(s, c as u8, n); s } |
