Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5625 from youknowone/clippy

Browse Source 
Apply nightly clippy suggestions
This commit is contained in:
Noa
2025-03-26 23:40:42 -05:00
committed by GitHub
parent 6e79a2aa8a bc38e9dedd
commit c9161c02b6
16 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/boxvec.rs
View File

@@ -550,7 +550,7 @@ impl<T> Extend<T> for BoxVec<T> {
};
let mut iter = iter.into_iter();
loop {
if ptr == end_ptr {
if std::ptr::eq(ptr, end_ptr) {
break;
}
if let Some(elt) = iter.next() {

2
common/src/str.rs
View File

@@ -418,7 +418,7 @@ pub fn zfill(bytes: &[u8], width: usize) -> Vec<u8> {
};
let mut filled = Vec::new();
filled.extend_from_slice(sign);
filled.extend(std::iter::repeat(b'0').take(width - bytes.len()));
filled.extend(std::iter::repeat_n(b'0', width - bytes.len()));
filled.extend_from_slice(s);
filled
}

2
compiler/codegen/src/compile.rs
View File

@@ -1519,7 +1519,7 @@ impl Compiler<'_> {
loop_data: None,
};
let prev_class_name = std::mem::replace(&mut self.class_name, Some(name.to_owned()));
let prev_class_name = self.class_name.replace(name.to_owned());
// Check if the class is declared global
let symbol_table = self.symbol_table_stack.last().unwrap();

3
compiler/codegen/src/ir.rs
View File

@@ -136,8 +136,7 @@ impl CodeInfo {
*arg = new_arg;
}
let (extras, lo_arg) = arg.split();
locations
.extend(std::iter::repeat(info.location.clone()).take(arg.instr_size()));
locations.extend(std::iter::repeat_n(info.location.clone(), arg.instr_size()));
instructions.extend(
extras
.map(|byte| CodeUnit::new(Instruction::ExtendedArg, byte))

2
compiler/codegen/src/symboltable.rs
View File

@@ -730,7 +730,7 @@ impl SymbolTableBuilder<'_> {
SymbolTableType::Class,
self.line_index_start(*range),
);
let prev_class = std::mem::replace(&mut self.class_name, Some(name.to_string()));
let prev_class = self.class_name.replace(name.to_string());
self.register_name("__module__", SymbolUsage::Assigned, *range)?;
self.register_name("__qualname__", SymbolUsage::Assigned, *range)?;
self.register_name("__doc__", SymbolUsage::Assigned, *range)?;

2
src/settings.rs
View File

@@ -305,7 +305,7 @@ pub fn parse_opts() -> Result<(Settings, RunMode), lexopt::Error> {
.then(|| get_env("PYTHONHASHSEED"))
.flatten()
{
Some(s) if s == "random" || s == "" => None,
Some(s) if s == "random" || s.is_empty() => None,
Some(s) => {
let seed = s.parse_with(|s| {
s.parse::<u32>().map_err(|_| {

2
stdlib/src/binascii.rs
View File

@@ -716,7 +716,7 @@ mod decl {
vm,
));
}
let mut res = Vec::<u8>::with_capacity(2 + ((length + 2) / 3) * 4);
let mut res = Vec::<u8>::with_capacity(2 + length.div_ceil(3) * 4);
res.push(uu_b2a(length as u8, backtick));
for chunk in b.chunks(3) {

4
stdlib/src/csv.rs
View File

@@ -982,7 +982,7 @@ mod _csv {
};
loop {
let (res, nread, nwritten, nends) = reader.read_record(
input[input_offset..].as_bytes(),
&input.as_bytes()[input_offset..],
&mut buffer[output_offset..],
&mut output_ends[output_ends_offset..],
);
@@ -999,7 +999,7 @@ mod _csv {
}
}
}
let rest = input[input_offset..].as_bytes();
let rest = &input.as_bytes()[input_offset..];
if !rest.iter().all(|&c| matches!(c, b'\r' | b'\n')) {
return Err(new_csv_error(
vm,

4
vm/src/anystr.rs
View File

@@ -283,9 +283,9 @@ pub trait AnyStr {
let mut u = Self::Container::with_capacity(
(left + right) * fillchar.bytes_len() + self.bytes_len(),
);
u.extend(std::iter::repeat(fillchar).take(left));
u.extend(std::iter::repeat_n(fillchar, left));
u.push_str(self);
u.extend(std::iter::repeat(fillchar).take(right));
u.extend(std::iter::repeat_n(fillchar, right));
u
}

6
vm/src/builtins/range.rs
View File

@@ -608,11 +608,7 @@ impl PyRangeIterator {
#[pymethod(magic)]
fn length_hint(&self) -> usize {
let index = self.index.load();
if index < self.length {
self.length - index
} else {
0
}
self.length.saturating_sub(index)
}
#[pymethod(magic)]

3
vm/src/builtins/staticmethod.rs
View File

@@ -27,8 +27,7 @@ impl GetDescriptor for PyStaticMethod {
vm: &VirtualMachine,
) -> PyResult {
let (zelf, _obj) = Self::_unwrap(&zelf, obj, vm)?;
let x = Ok(zelf.callable.lock().clone());
x
Ok(zelf.callable.lock().clone())
}
}

2
vm/src/builtins/tuple.rs
View File

@@ -429,7 +429,7 @@ impl Iterable for PyTuple {
impl Representable for PyTuple {
#[inline]
fn repr(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyStrRef> {
let s = if zelf.len() == 0 {
let s = if zelf.is_empty() {
vm.ctx.intern_str("()").to_owned()
} else if let Some(_guard) = ReprGuard::enter(vm, zelf.as_object()) {
let s = if zelf.len() == 1 {

2
vm/src/frame.rs
View File

@@ -1147,7 +1147,7 @@ impl ExecutingFrame<'_> {
bytecode::Instruction::FormatValue { conversion } => {
self.format_value(conversion.get(arg), vm)
}
bytecode::Instruction::PopException {} => {
bytecode::Instruction::PopException => {
let block = self.pop_block();
if let BlockType::ExceptHandler { prev_exc } = block.typ {
vm.set_exception(prev_exc);

16
vm/src/stdlib/ctypes/base.rs
View File

@@ -278,21 +278,21 @@ impl PyCSimple {
let value = unsafe { (*self.value.as_ptr()).clone() };
if let Ok(i) = value.try_int(vm) {
let i = i.as_bigint();
if ty.as_raw_ptr() == libffi::middle::Type::u8().as_raw_ptr() {
if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u8().as_raw_ptr()) {
return i.to_u8().map(|r: u8| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::i8().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i8().as_raw_ptr()) {
return i.to_i8().map(|r: i8| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::u16().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u16().as_raw_ptr()) {
return i.to_u16().map(|r: u16| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::i16().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i16().as_raw_ptr()) {
return i.to_i16().map(|r: i16| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::u32().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u32().as_raw_ptr()) {
return i.to_u32().map(|r: u32| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::i32().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i32().as_raw_ptr()) {
return i.to_i32().map(|r: i32| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::u64().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u64().as_raw_ptr()) {
return i.to_u64().map(|r: u64| libffi::middle::Arg::new(&r));
} else if ty.as_raw_ptr() == libffi::middle::Type::i64().as_raw_ptr() {
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i64().as_raw_ptr()) {
return i.to_i64().map(|r: i64| libffi::middle::Arg::new(&r));
} else {
return None;

7
vm/src/stdlib/itertools.rs
View File

@@ -335,7 +335,7 @@ mod decl {
item
} else {
let saved = zelf.saved.read();
if saved.len() == 0 {
if saved.is_empty() {
return Ok(PyIterReturn::StopIteration(None));
}
@@ -1332,8 +1332,7 @@ mod decl {
for arg in iterables.iter() {
pools.push(arg.try_to_value(vm)?);
}
let pools = std::iter::repeat(pools)
.take(repeat)
let pools = std::iter::repeat_n(pools, repeat)
.flatten()
.collect::<Vec<Vec<PyObjectRef>>>();
@@ -1353,7 +1352,7 @@ mod decl {
#[pyclass(with(IterNext, Iterable, Constructor))]
impl PyItertoolsProduct {
fn update_idxs(&self, mut idxs: PyRwLockWriteGuard<'_, Vec<usize>>) {
if idxs.len() == 0 {
if idxs.is_empty() {
self.stop.store(true);
return;
}

5
vm/src/stdlib/signal.rs
View File

@@ -184,10 +184,7 @@ pub(crate) mod _signal {
siginterrupt(signalnum, 1);
}
let old_handler = std::mem::replace(
&mut signal_handlers.borrow_mut()[signalnum as usize],
Some(handler),
);
let old_handler = signal_handlers.borrow_mut()[signalnum as usize].replace(handler);
Ok(old_handler)
}