Skip to content

Commit bd45250

Browse files
bjorn3folkertdev
bjorn3
authored and
folkertdev
committed
Replace usage of std with core
1 parent c4d0256 commit bd45250

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+17898
-17509
lines changed

‎c2rust-lib.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,36 @@ macro_rules! prefix {
8383
pub(crate) use prefix;
8484

8585
#[inline]
86-
pub(crate) fn MEM_isLittleEndian() -> std::ffi::c_uint {
86+
pub(crate) fn MEM_isLittleEndian() -> core::ffi::c_uint {
8787
cfg!(target_endian = "little") as _
8888
}
8989
#[inline]
90-
pub(crate) unsafe fn MEM_read16(mut ptr: *const std::ffi::c_void) -> u16 {
90+
pub(crate) unsafe fn MEM_read16(mut ptr: *const core::ffi::c_void) -> u16 {
9191
ptr.cast::<u16>().read_unaligned()
9292
}
9393
#[inline]
94-
pub(crate) unsafe fn MEM_read32(mut ptr: *const std::ffi::c_void) -> u32 {
94+
pub(crate) unsafe fn MEM_read32(mut ptr: *const core::ffi::c_void) -> u32 {
9595
ptr.cast::<u32>().read_unaligned()
9696
}
9797
#[inline]
98-
pub(crate) unsafe fn MEM_read64(mut ptr: *const std::ffi::c_void) -> u64 {
98+
pub(crate) unsafe fn MEM_read64(mut ptr: *const core::ffi::c_void) -> u64 {
9999
ptr.cast::<u64>().read_unaligned()
100100
}
101-
pub type size_t = std::ffi::c_ulong;
101+
pub type size_t = core::ffi::c_ulong;
102102
#[inline]
103-
pub(crate) unsafe extern "C" fn MEM_readST(mut ptr: *const std::ffi::c_void) -> size_t {
103+
pub(crate) unsafe extern "C" fn MEM_readST(mut ptr: *const core::ffi::c_void) -> size_t {
104104
ptr.cast::<size_t>().read_unaligned()
105105
}
106106
#[inline]
107-
pub(crate) unsafe fn MEM_write16(mut memPtr: *mut std::ffi::c_void, mut value: u16) {
107+
pub(crate) unsafe fn MEM_write16(mut memPtr: *mut core::ffi::c_void, mut value: u16) {
108108
memPtr.cast::<u16>().write_unaligned(value)
109109
}
110110
#[inline]
111-
pub(crate) unsafe fn MEM_write32(mut memPtr: *mut std::ffi::c_void, mut value: u32) {
111+
pub(crate) unsafe fn MEM_write32(mut memPtr: *mut core::ffi::c_void, mut value: u32) {
112112
memPtr.cast::<u32>().write_unaligned(value)
113113
}
114114
#[inline]
115-
pub(crate) unsafe fn MEM_write64(mut memPtr: *mut std::ffi::c_void, mut value: u64) {
115+
pub(crate) unsafe fn MEM_write64(mut memPtr: *mut core::ffi::c_void, mut value: u64) {
116116
memPtr.cast::<u64>().write_unaligned(value)
117117
}
118118
#[inline]
@@ -129,57 +129,57 @@ pub(crate) fn MEM_swap64(mut in_0: u64) -> u64 {
129129
}
130130

131131
#[inline]
132-
pub(crate) unsafe fn MEM_readLE16(mut memPtr: *const std::ffi::c_void) -> u16 {
132+
pub(crate) unsafe fn MEM_readLE16(mut memPtr: *const core::ffi::c_void) -> u16 {
133133
if MEM_isLittleEndian() != 0 {
134134
MEM_read16(memPtr)
135135
} else {
136136
let mut p = memPtr as *const u8;
137-
(*p.offset(0) as std::ffi::c_int + ((*p.offset(1) as std::ffi::c_int) << 8)) as u16
137+
(*p.offset(0) as core::ffi::c_int + ((*p.offset(1) as core::ffi::c_int) << 8)) as u16
138138
}
139139
}
140140
#[inline]
141-
pub unsafe fn MEM_readLE24(mut memPtr: *const std::ffi::c_void) -> u32 {
141+
pub unsafe fn MEM_readLE24(mut memPtr: *const core::ffi::c_void) -> u32 {
142142
(MEM_readLE16(memPtr) as u32).wrapping_add((*(memPtr as *const u8).offset(2) as u32) << 16)
143143
}
144144
#[inline]
145-
pub unsafe fn MEM_readLE32(mut memPtr: *const std::ffi::c_void) -> u32 {
145+
pub unsafe fn MEM_readLE32(mut memPtr: *const core::ffi::c_void) -> u32 {
146146
if MEM_isLittleEndian() != 0 {
147147
MEM_read32(memPtr)
148148
} else {
149149
MEM_swap32(MEM_read32(memPtr))
150150
}
151151
}
152152
#[inline]
153-
pub unsafe fn MEM_writeLE16(mut memPtr: *mut std::ffi::c_void, mut val32: u16) {
153+
pub unsafe fn MEM_writeLE16(mut memPtr: *mut core::ffi::c_void, mut val32: u16) {
154154
if MEM_isLittleEndian() != 0 {
155155
MEM_write16(memPtr, val32);
156156
} else {
157157
MEM_write16(memPtr, MEM_swap16(val32));
158158
};
159159
}
160160
#[inline]
161-
pub unsafe fn MEM_writeLE24(mut memPtr: *mut std::ffi::c_void, mut val: u32) {
161+
pub unsafe fn MEM_writeLE24(mut memPtr: *mut core::ffi::c_void, mut val: u32) {
162162
MEM_writeLE16(memPtr, val as u16);
163163
*(memPtr as *mut u8).offset(2) = (val >> 16) as u8;
164164
}
165165
#[inline]
166-
pub unsafe fn MEM_writeLE32(mut memPtr: *mut std::ffi::c_void, mut val32: u32) {
166+
pub unsafe fn MEM_writeLE32(mut memPtr: *mut core::ffi::c_void, mut val32: u32) {
167167
if MEM_isLittleEndian() != 0 {
168168
MEM_write32(memPtr, val32);
169169
} else {
170170
MEM_write32(memPtr, MEM_swap32(val32));
171171
};
172172
}
173173
#[inline]
174-
pub unsafe fn MEM_writeLE64(mut memPtr: *mut std::ffi::c_void, mut val64: u64) {
174+
pub unsafe fn MEM_writeLE64(mut memPtr: *mut core::ffi::c_void, mut val64: u64) {
175175
if MEM_isLittleEndian() != 0 {
176176
MEM_write64(memPtr, val64);
177177
} else {
178178
MEM_write64(memPtr, MEM_swap64(val64));
179179
};
180180
}
181181
#[inline]
182-
pub unsafe fn MEM_readLE64(mut memPtr: *const std::ffi::c_void) -> u64 {
182+
pub unsafe fn MEM_readLE64(mut memPtr: *const core::ffi::c_void) -> u64 {
183183
if MEM_isLittleEndian() != 0 {
184184
MEM_read64(memPtr)
185185
} else {
@@ -188,7 +188,7 @@ pub unsafe fn MEM_readLE64(mut memPtr: *const std::ffi::c_void) -> u64 {
188188
}
189189

190190
#[inline]
191-
unsafe extern "C" fn MEM_readLEST(mut memPtr: *const std::ffi::c_void) -> size_t {
191+
unsafe extern "C" fn MEM_readLEST(mut memPtr: *const core::ffi::c_void) -> size_t {
192192
match core::mem::size_of::<size_t>() {
193193
4 => MEM_readLE32(memPtr) as size_t,
194194
8 => MEM_readLE64(memPtr) as size_t,

‎lib/common/bitstream.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ pub type BitContainerType = usize;
1616
#[repr(C)]
1717
pub struct BIT_DStream_t {
1818
pub bitContainer: usize,
19-
pub bitsConsumed: std::ffi::c_uint,
20-
pub ptr: *const std::ffi::c_char,
21-
pub start: *const std::ffi::c_char,
22-
pub limitPtr: *const std::ffi::c_char,
19+
pub bitsConsumed: core::ffi::c_uint,
20+
pub ptr: *const core::ffi::c_char,
21+
pub start: *const core::ffi::c_char,
22+
pub limitPtr: *const core::ffi::c_char,
2323
}
2424

2525
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -71,9 +71,9 @@ impl BIT_DStream_t {
7171
let mut bitD = Self {
7272
bitContainer: 0,
7373
bitsConsumed: 0,
74-
ptr: std::ptr::null::<std::ffi::c_char>(),
75-
start: std::ptr::null::<std::ffi::c_char>(),
76-
limitPtr: std::ptr::null::<std::ffi::c_char>(),
74+
ptr: core::ptr::null::<core::ffi::c_char>(),
75+
start: core::ptr::null::<core::ffi::c_char>(),
76+
limitPtr: core::ptr::null::<core::ffi::c_char>(),
7777
};
7878

7979
if srcBuffer.is_empty() {
@@ -83,10 +83,10 @@ impl BIT_DStream_t {
8383
const USIZE_BYTES: usize = size_of::<BitContainerType>();
8484

8585
if let Some(chunk) = srcBuffer.last_chunk() {
86-
bitD.start = srcBuffer.as_ptr() as *const std::ffi::c_char;
86+
bitD.start = srcBuffer.as_ptr() as *const core::ffi::c_char;
8787
bitD.limitPtr = bitD.start.wrapping_add(USIZE_BYTES);
8888

89-
bitD.ptr = (srcBuffer.as_ptr() as *const std::ffi::c_char)
89+
bitD.ptr = (srcBuffer.as_ptr() as *const core::ffi::c_char)
9090
.wrapping_add(srcBuffer.len())
9191
.wrapping_sub(USIZE_BYTES);
9292
bitD.bitContainer = usize::from_le_bytes(*chunk) as size_t;
@@ -101,7 +101,7 @@ impl BIT_DStream_t {
101101
}
102102
}
103103
} else {
104-
bitD.start = srcBuffer.as_ptr() as *const std::ffi::c_char;
104+
bitD.start = srcBuffer.as_ptr() as *const core::ffi::c_char;
105105
bitD.limitPtr = bitD.start.wrapping_add(USIZE_BYTES);
106106
bitD.ptr = bitD.start;
107107

@@ -153,8 +153,8 @@ impl BIT_DStream_t {
153153
self.bitContainer,
154154
(size_of::<BitContainerType>() as u64)
155155
.wrapping_mul(8)
156-
.wrapping_sub(self.bitsConsumed as std::ffi::c_ulong)
157-
.wrapping_sub(nbBits as std::ffi::c_ulong) as u32,
156+
.wrapping_sub(self.bitsConsumed as core::ffi::c_ulong)
157+
.wrapping_sub(nbBits as core::ffi::c_ulong) as u32,
158158
nbBits,
159159
)
160160
}
@@ -179,15 +179,15 @@ impl BIT_DStream_t {
179179
///
180180
/// Pay attention to not read more than nbBits contained into local register.
181181
#[inline(always)]
182-
pub const fn read_bits(&mut self, nbBits: std::ffi::c_uint) -> BitContainerType {
182+
pub const fn read_bits(&mut self, nbBits: core::ffi::c_uint) -> BitContainerType {
183183
let value = self.look_bits(nbBits);
184184
self.skip_bits(nbBits);
185185
value
186186
}
187187

188188
/// Like [`read_bits`], but only works when `nbBits >= 1`
189189
#[inline]
190-
pub const fn read_bits_fast(&mut self, nbBits: std::ffi::c_uint) -> BitContainerType {
190+
pub const fn read_bits_fast(&mut self, nbBits: core::ffi::c_uint) -> BitContainerType {
191191
// quickcheck hits this
192192
// debug_assert!(nbBits > 1);
193193

@@ -230,7 +230,7 @@ impl BIT_DStream_t {
230230
pub fn reload(&mut self) -> StreamStatus {
231231
if self.bitsConsumed > (size_of::<BitContainerType>() as u32) * 8 {
232232
static zeroFilled: BitContainerType = 0;
233-
self.ptr = &zeroFilled as *const BitContainerType as *const std::ffi::c_char;
233+
self.ptr = &zeroFilled as *const BitContainerType as *const core::ffi::c_char;
234234

235235
return StreamStatus::Overflow;
236236
}
@@ -369,9 +369,9 @@ mod tests {
369369
let mut stream = BIT_DStream_t {
370370
bitContainer: 0,
371371
bitsConsumed: (size_of::<usize>() * 8 + 1) as u32,
372-
ptr: std::ptr::null(),
373-
start: std::ptr::null(),
374-
limitPtr: std::ptr::null(),
372+
ptr: core::ptr::null(),
373+
start: core::ptr::null(),
374+
limitPtr: core::ptr::null(),
375375
};
376376

377377
assert_eq!(stream.reload(), StreamStatus::Overflow);

‎lib/common/debug.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#[export_name = crate::prefix!(g_debuglevel)]
2-
pub static mut g_debuglevel: std::ffi::c_int = DEBUGLEVEL;
3-
pub const DEBUGLEVEL: std::ffi::c_int = 0;
2+
pub static mut g_debuglevel: core::ffi::c_int = DEBUGLEVEL;
3+
pub const DEBUGLEVEL: core::ffi::c_int = 0;

0 commit comments

Comments
 (0)