X Tutup
Skip to content

Commit da9ad35

Browse files
youknowoneyouknowone
committed
no_std clippy
1 parent bbe5412 commit da9ad35

39 files changed

+378
-369
lines changed

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ unsafe_op_in_unsafe_fn = "deny"
225225
elided_lifetimes_in_paths = "warn"
226226

227227
[workspace.lints.clippy]
228-
# alloc_instead_of_core = "warn"
229-
# std_instead_of_alloc = "warn"
230-
# std_instead_of_core = "warn"
228+
alloc_instead_of_core = "warn"
229+
std_instead_of_alloc = "warn"
230+
std_instead_of_core = "warn"
231231
perf = "warn"
232232
style = "warn"
233233
complexity = "warn"

‎crates/codegen/src/compile.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8328,7 +8328,7 @@ impl Compiler {
83288328
}
83298329

83308330
// Add trailing string
8331-
all_strings.push(std::mem::take(&mut current_string));
8331+
all_strings.push(core::mem::take(&mut current_string));
83328332

83338333
// Now build the Template:
83348334
// Stack currently has all interpolations from compile_tstring_into calls
@@ -8372,7 +8372,7 @@ impl Compiler {
83728372
}
83738373
ast::InterpolatedStringElement::Interpolation(interp) => {
83748374
// Finish current string segment
8375-
strings.push(std::mem::take(current_string));
8375+
strings.push(core::mem::take(current_string));
83768376

83778377
// Compile the interpolation value
83788378
self.compile_expression(&interp.expression)?;

‎crates/common/src/crt_fd.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ type BorrowedInner<'fd> = BorrowedFd<'fd>;
6464
#[cfg(windows)]
6565
mod win {
6666
use super::*;
67-
use std::marker::PhantomData;
68-
use std::mem::ManuallyDrop;
67+
use core::marker::PhantomData;
68+
use core::mem::ManuallyDrop;
6969

7070
#[repr(transparent)]
7171
pub(super) struct OwnedInner(i32);

‎crates/common/src/fileutils.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ pub fn fstat(fd: crate::crt_fd::Borrowed<'_>) -> std::io::Result<StatStruct> {
2424
pub mod windows {
2525
use crate::crt_fd;
2626
use crate::windows::ToWideString;
27+
use alloc::ffi::CString;
2728
use libc::{S_IFCHR, S_IFDIR, S_IFMT};
28-
use std::ffi::{CString, OsStr, OsString};
29+
use std::ffi::{OsStr, OsString};
2930
use std::os::windows::io::AsRawHandle;
3031
use std::sync::OnceLock;
3132
use windows_sys::Win32::Foundation::{
@@ -119,17 +120,17 @@ pub mod windows {
119120
});
120121
}
121122

122-
let mut info = unsafe { std::mem::zeroed() };
123-
let mut basic_info: FILE_BASIC_INFO = unsafe { std::mem::zeroed() };
124-
let mut id_info: FILE_ID_INFO = unsafe { std::mem::zeroed() };
123+
let mut info = unsafe { core::mem::zeroed() };
124+
let mut basic_info: FILE_BASIC_INFO = unsafe { core::mem::zeroed() };
125+
let mut id_info: FILE_ID_INFO = unsafe { core::mem::zeroed() };
125126

126127
if unsafe { GetFileInformationByHandle(h as _, &mut info) } == 0
127128
|| unsafe {
128129
GetFileInformationByHandleEx(
129130
h as _,
130131
FileBasicInfo,
131132
&mut basic_info as *mut _ as *mut _,
132-
std::mem::size_of_val(&basic_info) as u32,
133+
core::mem::size_of_val(&basic_info) as u32,
133134
)
134135
} == 0
135136
{
@@ -141,7 +142,7 @@ pub mod windows {
141142
h as _,
142143
FileIdInfo,
143144
&mut id_info as *mut _ as *mut _,
144-
std::mem::size_of_val(&id_info) as u32,
145+
core::mem::size_of_val(&id_info) as u32,
145146
)
146147
} == 0
147148
{
@@ -334,8 +335,8 @@ pub mod windows {
334335
.ok_or_else(|| std::io::Error::from_raw_os_error(ERROR_NOT_SUPPORTED as _))?;
335336

336337
let file_name = file_name.to_wide_with_nul();
337-
let file_info_buffer_size = std::mem::size_of::<FILE_STAT_BASIC_INFORMATION>() as u32;
338-
let mut file_info_buffer = std::mem::MaybeUninit::<FILE_STAT_BASIC_INFORMATION>::uninit();
338+
let file_info_buffer_size = core::mem::size_of::<FILE_STAT_BASIC_INFORMATION>() as u32;
339+
let mut file_info_buffer = core::mem::MaybeUninit::<FILE_STAT_BASIC_INFORMATION>::uninit();
339340
unsafe {
340341
if GetFileInformationByName(
341342
file_name.as_ptr(),

‎crates/stdlib/src/_asyncio.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pub(crate) mod _asyncio {
2525
warn,
2626
},
2727
};
28+
use core::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, Ordering};
2829
use crossbeam_utils::atomic::AtomicCell;
29-
use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, Ordering};
3030

3131
pub(crate) fn module_exec(vm: &VirtualMachine, module: &Py<PyModule>) -> PyResult<()> {
3232
__module_exec(vm, module);

‎crates/stdlib/src/_sqlite3.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ pub(crate) use _sqlite3::module_def;
1212

1313
#[pymodule]
1414
mod _sqlite3 {
15+
use core::{
16+
ffi::{CStr, c_int, c_longlong, c_uint, c_void},
17+
fmt::Debug,
18+
ops::Deref,
19+
ptr::{NonNull, null, null_mut},
20+
};
1521
use libsqlite3_sys::{
1622
SQLITE_BLOB, SQLITE_DETERMINISTIC, SQLITE_FLOAT, SQLITE_INTEGER, SQLITE_NULL,
1723
SQLITE_OPEN_CREATE, SQLITE_OPEN_READWRITE, SQLITE_OPEN_URI, SQLITE_TEXT, SQLITE_TRACE_STMT,
@@ -70,13 +76,7 @@ mod _sqlite3 {
7076
},
7177
utils::ToCString,
7278
};
73-
use std::{
74-
ffi::{CStr, c_int, c_longlong, c_uint, c_void},
75-
fmt::Debug,
76-
ops::Deref,
77-
ptr::{NonNull, null, null_mut},
78-
thread::ThreadId,
79-
};
79+
use std::thread::ThreadId;
8080

8181
macro_rules! exceptions {
8282
($(($x:ident, $base:expr)),*) => {
@@ -451,7 +451,7 @@ mod _sqlite3 {
451451
) {
452452
let context = SqliteContext::from(context);
453453
let (func, vm) = unsafe { (*context.user_data::<Self>()).retrieve() };
454-
let args = unsafe { std::slice::from_raw_parts(argv, argc as usize) };
454+
let args = unsafe { core::slice::from_raw_parts(argv, argc as usize) };
455455

456456
let f = || -> PyResult<()> {
457457
let db = context.db_handle();
@@ -478,7 +478,7 @@ mod _sqlite3 {
478478
) {
479479
let context = SqliteContext::from(context);
480480
let (cls, vm) = unsafe { (*context.user_data::<Self>()).retrieve() };
481-
let args = unsafe { std::slice::from_raw_parts(argv, argc as usize) };
481+
let args = unsafe { core::slice::from_raw_parts(argv, argc as usize) };
482482
let instance = context.aggregate_context::<*const PyObject>();
483483
if unsafe { (*instance).is_null() } {
484484
match cls.call((), vm) {
@@ -556,7 +556,7 @@ mod _sqlite3 {
556556
) {
557557
let context = SqliteContext::from(context);
558558
let (_, vm) = unsafe { (*context.user_data::<Self>()).retrieve() };
559-
let args = unsafe { std::slice::from_raw_parts(argv, argc as usize) };
559+
let args = unsafe { core::slice::from_raw_parts(argv, argc as usize) };
560560
let instance = context.aggregate_context::<*const PyObject>();
561561
let instance = unsafe { &**instance };
562562

@@ -882,7 +882,7 @@ mod _sqlite3 {
882882
}
883883

884884
impl Debug for Connection {
885-
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
885+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
886886
write!(f, "Sqlite3 Connection")
887887
}
888888
}
@@ -2077,7 +2077,7 @@ mod _sqlite3 {
20772077
} else {
20782078
let nbytes = st.column_bytes(i);
20792079
let blob = unsafe {
2080-
std::slice::from_raw_parts(blob.cast::<u8>(), nbytes as usize)
2080+
core::slice::from_raw_parts(blob.cast::<u8>(), nbytes as usize)
20812081
};
20822082
let blob = vm.ctx.new_bytes(blob.to_vec());
20832083
converter.call((blob,), vm)?
@@ -2684,7 +2684,7 @@ mod _sqlite3 {
26842684
}
26852685

26862686
impl Debug for Statement {
2687-
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
2687+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
26882688
write!(
26892689
f,
26902690
"{} Statement",

‎crates/stdlib/src/math.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,9 @@ mod math {
732732

733733
// Collect current + remaining elements
734734
let p_remaining: Result<Vec<PyObjectRef>, _> =
735-
std::iter::once(Ok(p_i)).chain(p_iter).collect();
735+
core::iter::once(Ok(p_i)).chain(p_iter).collect();
736736
let q_remaining: Result<Vec<PyObjectRef>, _> =
737-
std::iter::once(Ok(q_i)).chain(q_iter).collect();
737+
core::iter::once(Ok(q_i)).chain(q_iter).collect();
738738
let (p_vec, q_vec) = (p_remaining?, q_remaining?);
739739

740740
if p_vec.len() != q_vec.len() {

‎crates/stdlib/src/mmap.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ mod mmap {
576576
SetFilePointerEx(
577577
duplicated_handle,
578578
required_size,
579-
std::ptr::null_mut(),
579+
core::ptr::null_mut(),
580580
FILE_BEGIN,
581581
)
582582
};
@@ -617,7 +617,7 @@ mod mmap {
617617

618618
// Keep the handle alive
619619
let raw = owned_handle.as_raw_handle() as isize;
620-
std::mem::forget(owned_handle);
620+
core::mem::forget(owned_handle);
621621
(raw, mmap)
622622
} else {
623623
// Anonymous mapping
@@ -1088,7 +1088,7 @@ mod mmap {
10881088
SetFilePointerEx(
10891089
handle as HANDLE,
10901090
required_size,
1091-
std::ptr::null_mut(),
1091+
core::ptr::null_mut(),
10921092
FILE_BEGIN,
10931093
)
10941094
};
@@ -1267,7 +1267,7 @@ mod mmap {
12671267
#[cfg(windows)]
12681268
#[pymethod]
12691269
fn __sizeof__(&self) -> usize {
1270-
std::mem::size_of::<Self>()
1270+
core::mem::size_of::<Self>()
12711271
}
12721272
}
12731273

@@ -1297,7 +1297,7 @@ mod mmap {
12971297
};
12981298

12991299
// Don't close the file handle - we're borrowing it
1300-
std::mem::forget(file);
1300+
core::mem::forget(file);
13011301

13021302
result
13031303
}

‎crates/stdlib/src/multiprocessing.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@ mod _multiprocessing {
5252
function::{FuncArgs, KwArgs},
5353
types::Constructor,
5454
};
55+
use alloc::ffi::CString;
56+
use core::sync::atomic::{AtomicI32, AtomicU64, Ordering};
5557
use libc::sem_t;
5658
use nix::errno::Errno;
57-
use std::{
58-
ffi::CString,
59-
sync::atomic::{AtomicI32, AtomicU64, Ordering},
60-
};
6159

6260
/// Error type for sem_timedwait operations
6361
#[cfg(target_vendor = "apple")]
@@ -92,7 +90,7 @@ mod _multiprocessing {
9290
tv_sec: 0,
9391
tv_usec: 0,
9492
};
95-
if unsafe { libc::gettimeofday(&mut now, std::ptr::null_mut()) } < 0 {
93+
if unsafe { libc::gettimeofday(&mut now, core::ptr::null_mut()) } < 0 {
9694
return Err(SemWaitError::OsError(Errno::last()));
9795
}
9896

@@ -125,9 +123,9 @@ mod _multiprocessing {
125123
unsafe {
126124
libc::select(
127125
0,
128-
std::ptr::null_mut(),
129-
std::ptr::null_mut(),
130-
std::ptr::null_mut(),
126+
core::ptr::null_mut(),
127+
core::ptr::null_mut(),
128+
core::ptr::null_mut(),
131129
&mut tv_delay,
132130
)
133131
};
@@ -302,7 +300,7 @@ mod _multiprocessing {
302300
tv_sec: 0,
303301
tv_usec: 0,
304302
};
305-
let res = unsafe { libc::gettimeofday(&mut tv, std::ptr::null_mut()) };
303+
let res = unsafe { libc::gettimeofday(&mut tv, core::ptr::null_mut()) };
306304
if res < 0 {
307305
return Err(vm.new_os_error("gettimeofday failed".to_string()));
308306
}

0 commit comments

Comments
 (0)
X Tutup