Skip to content

Commit bc38e9d

Browse files
youknowoneyouknowone
committed
Apply nightly clippy suggestions
1 parent 7ac90f5 commit bc38e9d

File tree

16 files changed

+27
-37
lines changed

16 files changed

+27
-37
lines changed

‎common/src/boxvec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ impl<T> Extend<T> for BoxVec<T> {
550550
};
551551
let mut iter = iter.into_iter();
552552
loop {
553-
if ptr == end_ptr {
553+
if std::ptr::eq(ptr, end_ptr) {
554554
break;
555555
}
556556
if let Some(elt) = iter.next() {

‎common/src/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ pub fn zfill(bytes: &[u8], width: usize) -> Vec<u8> {
418418
};
419419
let mut filled = Vec::new();
420420
filled.extend_from_slice(sign);
421-
filled.extend(std::iter::repeat(b'0').take(width - bytes.len()));
421+
filled.extend(std::iter::repeat_n(b'0', width - bytes.len()));
422422
filled.extend_from_slice(s);
423423
filled
424424
}

‎compiler/codegen/src/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ impl Compiler<'_> {
15191519
loop_data: None,
15201520
};
15211521

1522-
let prev_class_name = std::mem::replace(&mut self.class_name, Some(name.to_owned()));
1522+
let prev_class_name = self.class_name.replace(name.to_owned());
15231523

15241524
// Check if the class is declared global
15251525
let symbol_table = self.symbol_table_stack.last().unwrap();

‎compiler/codegen/src/ir.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ impl CodeInfo {
136136
*arg = new_arg;
137137
}
138138
let (extras, lo_arg) = arg.split();
139-
locations
140-
.extend(std::iter::repeat(info.location.clone()).take(arg.instr_size()));
139+
locations.extend(std::iter::repeat_n(info.location.clone(), arg.instr_size()));
141140
instructions.extend(
142141
extras
143142
.map(|byte| CodeUnit::new(Instruction::ExtendedArg, byte))

‎compiler/codegen/src/symboltable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ impl SymbolTableBuilder<'_> {
730730
SymbolTableType::Class,
731731
self.line_index_start(*range),
732732
);
733-
let prev_class = std::mem::replace(&mut self.class_name, Some(name.to_string()));
733+
let prev_class = self.class_name.replace(name.to_string());
734734
self.register_name("__module__", SymbolUsage::Assigned, *range)?;
735735
self.register_name("__qualname__", SymbolUsage::Assigned, *range)?;
736736
self.register_name("__doc__", SymbolUsage::Assigned, *range)?;

‎src/settings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ pub fn parse_opts() -> Result<(Settings, RunMode), lexopt::Error> {
305305
.then(|| get_env("PYTHONHASHSEED"))
306306
.flatten()
307307
{
308-
Some(s) if s == "random" || s == "" => None,
308+
Some(s) if s == "random" || s.is_empty() => None,
309309
Some(s) => {
310310
let seed = s.parse_with(|s| {
311311
s.parse::<u32>().map_err(|_| {

‎stdlib/src/binascii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ mod decl {
716716
vm,
717717
));
718718
}
719-
let mut res = Vec::<u8>::with_capacity(2 + ((length + 2) / 3) * 4);
719+
let mut res = Vec::<u8>::with_capacity(2 + length.div_ceil(3) * 4);
720720
res.push(uu_b2a(length as u8, backtick));
721721

722722
for chunk in b.chunks(3) {

‎stdlib/src/csv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ mod _csv {
982982
};
983983
loop {
984984
let (res, nread, nwritten, nends) = reader.read_record(
985-
input[input_offset..].as_bytes(),
985+
&input.as_bytes()[input_offset..],
986986
&mut buffer[output_offset..],
987987
&mut output_ends[output_ends_offset..],
988988
);
@@ -999,7 +999,7 @@ mod _csv {
999999
}
10001000
}
10011001
}
1002-
let rest = input[input_offset..].as_bytes();
1002+
let rest = &input.as_bytes()[input_offset..];
10031003
if !rest.iter().all(|&c| matches!(c, b'\r' | b'\n')) {
10041004
return Err(new_csv_error(
10051005
vm,

‎vm/src/anystr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ pub trait AnyStr {
283283
let mut u = Self::Container::with_capacity(
284284
(left + right) * fillchar.bytes_len() + self.bytes_len(),
285285
);
286-
u.extend(std::iter::repeat(fillchar).take(left));
286+
u.extend(std::iter::repeat_n(fillchar, left));
287287
u.push_str(self);
288-
u.extend(std::iter::repeat(fillchar).take(right));
288+
u.extend(std::iter::repeat_n(fillchar, right));
289289
u
290290
}
291291

‎vm/src/builtins/range.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,7 @@ impl PyRangeIterator {
608608
#[pymethod(magic)]
609609
fn length_hint(&self) -> usize {
610610
let index = self.index.load();
611-
if index < self.length {
612-
self.length - index
613-
} else {
614-
0
615-
}
611+
self.length.saturating_sub(index)
616612
}
617613

618614
#[pymethod(magic)]

‎vm/src/builtins/staticmethod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ impl GetDescriptor for PyStaticMethod {
2727
vm: &VirtualMachine,
2828
) -> PyResult {
2929
let (zelf, _obj) = Self::_unwrap(&zelf, obj, vm)?;
30-
let x = Ok(zelf.callable.lock().clone());
31-
x
30+
Ok(zelf.callable.lock().clone())
3231
}
3332
}
3433

‎vm/src/builtins/tuple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ impl Iterable for PyTuple {
430430
impl Representable for PyTuple {
431431
#[inline]
432432
fn repr(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyStrRef> {
433-
let s = if zelf.len() == 0 {
433+
let s = if zelf.is_empty() {
434434
vm.ctx.intern_str("()").to_owned()
435435
} else if let Some(_guard) = ReprGuard::enter(vm, zelf.as_object()) {
436436
let s = if zelf.len() == 1 {

‎vm/src/frame.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ impl ExecutingFrame<'_> {
11471147
bytecode::Instruction::FormatValue { conversion } => {
11481148
self.format_value(conversion.get(arg), vm)
11491149
}
1150-
bytecode::Instruction::PopException {} => {
1150+
bytecode::Instruction::PopException => {
11511151
let block = self.pop_block();
11521152
if let BlockType::ExceptHandler { prev_exc } = block.typ {
11531153
vm.set_exception(prev_exc);

‎vm/src/stdlib/ctypes/base.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,21 +278,21 @@ impl PyCSimple {
278278
let value = unsafe { (*self.value.as_ptr()).clone() };
279279
if let Ok(i) = value.try_int(vm) {
280280
let i = i.as_bigint();
281-
if ty.as_raw_ptr() == libffi::middle::Type::u8().as_raw_ptr() {
281+
if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u8().as_raw_ptr()) {
282282
return i.to_u8().map(|r: u8| libffi::middle::Arg::new(&r));
283-
} else if ty.as_raw_ptr() == libffi::middle::Type::i8().as_raw_ptr() {
283+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i8().as_raw_ptr()) {
284284
return i.to_i8().map(|r: i8| libffi::middle::Arg::new(&r));
285-
} else if ty.as_raw_ptr() == libffi::middle::Type::u16().as_raw_ptr() {
285+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u16().as_raw_ptr()) {
286286
return i.to_u16().map(|r: u16| libffi::middle::Arg::new(&r));
287-
} else if ty.as_raw_ptr() == libffi::middle::Type::i16().as_raw_ptr() {
287+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i16().as_raw_ptr()) {
288288
return i.to_i16().map(|r: i16| libffi::middle::Arg::new(&r));
289-
} else if ty.as_raw_ptr() == libffi::middle::Type::u32().as_raw_ptr() {
289+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u32().as_raw_ptr()) {
290290
return i.to_u32().map(|r: u32| libffi::middle::Arg::new(&r));
291-
} else if ty.as_raw_ptr() == libffi::middle::Type::i32().as_raw_ptr() {
291+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i32().as_raw_ptr()) {
292292
return i.to_i32().map(|r: i32| libffi::middle::Arg::new(&r));
293-
} else if ty.as_raw_ptr() == libffi::middle::Type::u64().as_raw_ptr() {
293+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::u64().as_raw_ptr()) {
294294
return i.to_u64().map(|r: u64| libffi::middle::Arg::new(&r));
295-
} else if ty.as_raw_ptr() == libffi::middle::Type::i64().as_raw_ptr() {
295+
} else if std::ptr::eq(ty.as_raw_ptr(), libffi::middle::Type::i64().as_raw_ptr()) {
296296
return i.to_i64().map(|r: i64| libffi::middle::Arg::new(&r));
297297
} else {
298298
return None;

‎vm/src/stdlib/itertools.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ mod decl {
335335
item
336336
} else {
337337
let saved = zelf.saved.read();
338-
if saved.len() == 0 {
338+
if saved.is_empty() {
339339
return Ok(PyIterReturn::StopIteration(None));
340340
}
341341

@@ -1332,8 +1332,7 @@ mod decl {
13321332
for arg in iterables.iter() {
13331333
pools.push(arg.try_to_value(vm)?);
13341334
}
1335-
let pools = std::iter::repeat(pools)
1336-
.take(repeat)
1335+
let pools = std::iter::repeat_n(pools, repeat)
13371336
.flatten()
13381337
.collect::<Vec<Vec<PyObjectRef>>>();
13391338

@@ -1353,7 +1352,7 @@ mod decl {
13531352
#[pyclass(with(IterNext, Iterable, Constructor))]
13541353
impl PyItertoolsProduct {
13551354
fn update_idxs(&self, mut idxs: PyRwLockWriteGuard<'_, Vec<usize>>) {
1356-
if idxs.len() == 0 {
1355+
if idxs.is_empty() {
13571356
self.stop.store(true);
13581357
return;
13591358
}

‎vm/src/stdlib/signal.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,7 @@ pub(crate) mod _signal {
182182
siginterrupt(signalnum, 1);
183183
}
184184

185-
let old_handler = std::mem::replace(
186-
&mut signal_handlers.borrow_mut()[signalnum as usize],
187-
Some(handler),
188-
);
185+
let old_handler = signal_handlers.borrow_mut()[signalnum as usize].replace(handler);
189186
Ok(old_handler)
190187
}
191188

0 commit comments

Comments
 (0)