Skip to content

Commit 0577256

Browse files
committed
Fix clippy on 1.92
1 parent ebfc3ea commit 0577256

File tree

11 files changed

+7
-12
lines changed

11 files changed

+7
-12
lines changed

crates/codegen/src/unparse.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,11 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> {
380380
.fmt(self.f)?
381381
}
382382
Expr::NumberLiteral(ruff::ExprNumberLiteral { value, .. }) => {
383-
const { assert!(f64::MAX_10_EXP == 308) };
383+
#[allow(clippy::correctness, clippy::assertions_on_constants)]
384+
const {
385+
assert!(f64::MAX_10_EXP == 308)
386+
};
387+
384388
let inf_str = "1e309";
385389
match value {
386390
ruff::Number::Int(int) => int.fmt(self.f)?,

crates/vm/src/builtins/bool.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::{
66
class::PyClassImpl,
77
convert::{IntoPyException, ToPyObject, ToPyResult},
88
function::{FuncArgs, OptionalArg},
9-
identifier,
109
protocol::PyNumberMethods,
1110
types::{AsNumber, Constructor, Representable},
1211
};

crates/vm/src/builtins/complex.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use crate::{
1010
PyArithmeticValue::{self, *},
1111
PyComparisonValue,
1212
},
13-
identifier,
1413
protocol::PyNumberMethods,
1514
stdlib::warnings,
1615
types::{AsNumber, Comparable, Constructor, Hashable, PyComparisonOp, Representable},

crates/vm/src/builtins/type.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use crate::{
2222
},
2323
convert::ToPyResult,
2424
function::{FuncArgs, KwArgs, OptionalArg, PyMethodDef, PySetterValue},
25-
identifier,
2625
object::{Traverse, TraverseFn},
2726
protocol::{PyIterReturn, PyMappingMethods, PyNumberMethods, PySequenceMethods},
2827
types::{

crates/vm/src/class.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
use crate::{
44
builtins::{PyBaseObject, PyType, PyTypeRef},
55
function::PyMethodDef,
6-
identifier,
76
object::Py,
87
types::{PyTypeFlags, PyTypeSlots, hash_not_implemented},
98
vm::Context,

crates/vm/src/function/protocol.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::{
33
AsObject, PyObject, PyObjectRef, PyPayload, PyResult, TryFromObject, VirtualMachine,
44
builtins::{PyDict, PyDictRef, iter::PySequenceIterator},
55
convert::ToPyObject,
6-
identifier,
76
object::{Traverse, TraverseFn},
87
protocol::{PyIter, PyIterIter, PyMapping, PyMappingMethods},
98
types::{AsMapping, GenericMethod},

crates/vm/src/stdlib/itertools.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ mod decl {
1616
},
1717
convert::ToPyObject,
1818
function::{ArgCallable, ArgIntoBool, FuncArgs, OptionalArg, OptionalOption, PosArgs},
19-
identifier,
2019
protocol::{PyIter, PyIterReturn, PyNumber},
2120
raise_if_stop,
2221
stdlib::{sys, warnings},

crates/vm/src/stdlib/operator.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ mod _operator {
77
builtins::{PyInt, PyIntRef, PyStr, PyStrRef, PyTupleRef, PyType, PyTypeRef},
88
common::wtf8::Wtf8,
99
function::{ArgBytesLike, Either, FuncArgs, KwArgs, OptionalArg},
10-
identifier,
1110
protocol::PyIter,
1211
recursion::ReprGuard,
1312
types::{Callable, Constructor, PyComparisonOp, Representable},

crates/vm/src/stdlib/os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,8 @@ pub(super) mod _os {
15061506
#[cfg(target_os = "linux")]
15071507
#[pyfunction]
15081508
fn copy_file_range(args: CopyFileRangeArgs<'_>, vm: &VirtualMachine) -> PyResult<usize> {
1509-
let p_offset_src = args.offset_src.as_ref().map_or_else(std::ptr::null, |x| x);
1510-
let p_offset_dst = args.offset_dst.as_ref().map_or_else(std::ptr::null, |x| x);
1509+
let p_offset_src = args.offset_src.as_ref().unwrap_or_else(std::ptr::null);
1510+
let p_offset_dst = args.offset_dst.as_ref().unwrap_or_else(std::ptr::null);
15111511
let count: usize = args
15121512
.count
15131513
.try_into()

crates/vm/src/types/slot.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use crate::{
77
function::{
88
Either, FromArgs, FuncArgs, OptionalArg, PyComparisonValue, PyMethodDef, PySetterValue,
99
},
10-
identifier,
1110
protocol::{
1211
PyBuffer, PyIterReturn, PyMapping, PyMappingMethods, PyNumber, PyNumberMethods,
1312
PyNumberSlots, PySequence, PySequenceMethods,

0 commit comments

Comments
 (0)