Skip to content

Commit 8d61a22

Browse files
coolreader18coolreader18
authored
Merge pull request RustPython#7620 from ShaharNaveh/ci-fix-clippy
CI: fix clippy lints
2 parents aa12acc + 640cbd7 commit 8d61a22

File tree

9 files changed

+41
-48
lines changed

9 files changed

+41
-48
lines changed

‎crates/stdlib/src/_sqlite3.rs‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,36 +3537,30 @@ mod _sqlite3 {
35373537
// Skip whitespace.
35383538
pos += 1;
35393539
}
3540-
b'-' => {
3541-
// Skip line comments.
3542-
if sql.get(pos + 1) == Some(&b'-') {
3543-
pos += 2;
3544-
while let Some(&ch) = sql.get(pos) {
3545-
if ch == b'\n' {
3546-
break;
3547-
}
3548-
pos += 1;
3540+
3541+
// Skip line comments.
3542+
b'-' if sql.get(pos + 1) == Some(&b'-') => {
3543+
pos += 2;
3544+
while let Some(&ch) = sql.get(pos) {
3545+
if ch == b'\n' {
3546+
break;
35493547
}
3550-
let _ = sql.get(pos)?;
3551-
} else {
3552-
return Some(&sql[pos..]);
3548+
pos += 1;
35533549
}
3550+
let _ = sql.get(pos)?;
35543551
}
3555-
b'/' => {
3556-
// Skip C style comments.
3557-
if sql.get(pos + 1) == Some(&b'*') {
3558-
pos += 2;
3559-
while let Some(&ch) = sql.get(pos) {
3560-
if ch == b'*' && sql.get(pos + 1) == Some(&b'/') {
3561-
break;
3562-
}
3563-
pos += 1;
3552+
3553+
// Skip C style comments.
3554+
b'/' if sql.get(pos + 1) == Some(&b'*') => {
3555+
pos += 2;
3556+
while let Some(&ch) = sql.get(pos) {
3557+
if ch == b'*' && sql.get(pos + 1) == Some(&b'/') {
3558+
break;
35643559
}
3565-
let _ = sql.get(pos)?;
3566-
pos += 2;
3567-
} else {
3568-
return Some(&sql[pos..]);
3560+
pos += 1;
35693561
}
3562+
let _ = sql.get(pos)?;
3563+
pos += 2;
35703564
}
35713565
_ => {
35723566
return Some(&sql[pos..]);

‎crates/vm/src/builtins/type.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2103,9 +2103,8 @@ impl Constructor for PyType {
21032103
.map_err(|e| vm.new_type_error(e))?;
21042104

21052105
if let Some(ref slots) = heaptype_slots {
2106-
let mut offset = base_member_count;
21072106
let class_name = typ.name().to_string();
2108-
for member in slots.as_slice() {
2107+
for (offset, member) in (base_member_count..).zip(slots.as_slice().iter()) {
21092108
// Apply name mangling for private attributes (__x -> _ClassName__x)
21102109
let member_str = member
21112110
.to_str()
@@ -2131,7 +2130,6 @@ impl Constructor for PyType {
21312130
// __slots__ attributes always get a member descriptor
21322131
// (this overrides any inherited attribute from MRO)
21332132
typ.set_attr(attr_name, member_descriptor.into());
2134-
offset += 1;
21352133
}
21362134
}
21372135

‎crates/vm/src/builtins/union.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ fn dedup_and_flatten_args(args: &Py<PyTuple>, vm: &VirtualMachine) -> PyResult<U
342342

343343
// Create hashable_args frozenset if there are hashable elements
344344
let hashable_args = if !hashable_list.is_empty() {
345-
Some(PyFrozenSet::from_iter(vm, hashable_list.into_iter())?.into_ref(&vm.ctx))
345+
Some(PyFrozenSet::from_iter(vm, hashable_list)?.into_ref(&vm.ctx))
346346
} else {
347347
None
348348
};
@@ -517,7 +517,7 @@ impl Hashable for PyUnion {
517517
Err(e) => return Err(e),
518518
}
519519
}
520-
let set = PyFrozenSet::from_iter(vm, args_to_hash.into_iter())?;
520+
let set = PyFrozenSet::from_iter(vm, args_to_hash)?;
521521
PyFrozenSet::hash(&set.into_ref(&vm.ctx), vm)
522522
}
523523
}

‎crates/vm/src/codecs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ impl<'a> DecodeErrorHandler<PyDecodeContext<'a>> for SurrogatePass {
532532
.ok_or_else(|| ctx.error_decoding(byte_range.clone(), reason))?;
533533

534534
let s = ctx.full_data();
535-
debug_assert!(byte_range.start <= 0.max(s.len() - 1));
535+
debug_assert!(byte_range.start <= s.len().saturating_sub(1));
536536
debug_assert!(byte_range.end >= 1.min(s.len()));
537537
debug_assert!(byte_range.end <= s.len());
538538

‎crates/vm/src/stdlib/_abc.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ mod _abc {
191191
}
192192

193193
// Set __abstractmethods__
194-
let abstracts_set = PyFrozenSet::from_iter(vm, abstracts.into_iter())?;
194+
let abstracts_set = PyFrozenSet::from_iter(vm, abstracts)?;
195195
cls.set_attr("__abstractmethods__", abstracts_set.into_pyobject(vm), vm)?;
196196

197197
Ok(())
@@ -302,7 +302,7 @@ mod _abc {
302302
drop(registry_opt);
303303

304304
// Make a local copy to protect against concurrent modifications
305-
let registry_copy = PyFrozenSet::from_iter(vm, registry.elements().into_iter())?;
305+
let registry_copy = PyFrozenSet::from_iter(vm, registry.elements())?;
306306

307307
for weak_ref_obj in registry_copy.elements() {
308308
if let Ok(weak_ref) = weak_ref_obj.downcast::<PyWeak>()

‎crates/vm/src/stdlib/_ctypes/simple.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,17 @@ impl PyCSimpleType {
301301
// 4. Try to convert value based on type code
302302
match type_code.as_deref() {
303303
// Integer types: accept integers
304-
Some(tc @ ("b" | "B" | "h" | "H" | "i" | "I" | "l" | "L" | "q" | "Q")) => {
305-
if value.try_int(vm).is_ok() {
306-
return create_simple_with_value(tc, &value);
307-
}
304+
Some(tc @ ("b" | "B" | "h" | "H" | "i" | "I" | "l" | "L" | "q" | "Q"))
305+
if value.try_int(vm).is_ok() =>
306+
{
307+
return create_simple_with_value(tc, &value);
308308
}
309+
309310
// Float types: accept numbers
310-
Some(tc @ ("f" | "d" | "g")) => {
311-
if value.try_float(vm).is_ok() || value.try_int(vm).is_ok() {
312-
return create_simple_with_value(tc, &value);
313-
}
311+
Some(tc @ ("f" | "d" | "g"))
312+
if (value.try_float(vm).is_ok() || value.try_int(vm).is_ok()) =>
313+
{
314+
return create_simple_with_value(tc, &value);
314315
}
315316
// c_char: 1 byte character
316317
Some("c") => {

‎crates/vm/src/stdlib/_winapi.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ mod _winapi {
417417
// Deduplicate case-insensitive keys, keeping the last value
418418
use std::collections::HashMap;
419419
let mut last_entry: HashMap<String, widestring::WideString> = HashMap::new();
420-
for (k, v) in keys.into_iter().zip(values.into_iter()) {
420+
for (k, v) in keys.into_iter().zip(values) {
421421
let k = PyStrRef::try_from_object(vm, k)?;
422422
let k = k.expect_str();
423423
let v = PyStrRef::try_from_object(vm, v)?;

‎crates/vm/src/stdlib/time.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,8 @@ mod platform {
14411441
let zone = widestring::decode_utf16_lossy(name.iter().copied())
14421442
.take_while(|&c| c != '\0')
14431443
.collect::<String>();
1444+
1445+
#[allow(clippy::unnecessary_cast, reason = "info.Bias is not always i32")]
14441446
let gmtoff = -((info.Bias + bias) as i32) * 60;
14451447

14461448
Ok(struct_time_from_tm(vm, tm, &zone, gmtoff))

‎crates/vm/src/types/slot.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,12 +1394,10 @@ impl PyType {
13941394
SlotAccessor::SqLength => {
13951395
update_sub_slot!(as_sequence, length, sequence_len_wrapper, SeqLength)
13961396
}
1397-
SlotAccessor::SqConcat | SlotAccessor::SqInplaceConcat => {
1398-
// Sequence concat uses sq_concat slot - no generic wrapper needed
1399-
// (handled by number protocol fallback)
1400-
if !ADD {
1401-
accessor.inherit_from_mro(self);
1402-
}
1397+
// Sequence concat uses sq_concat slot - no generic wrapper needed
1398+
// (handled by number protocol fallback)
1399+
SlotAccessor::SqConcat | SlotAccessor::SqInplaceConcat if !ADD => {
1400+
accessor.inherit_from_mro(self);
14031401
}
14041402
SlotAccessor::SqRepeat => {
14051403
update_sub_slot!(as_sequence, repeat, sequence_repeat_wrapper, SeqRepeat)

0 commit comments

Comments
 (0)