Skip to content

Commit d94f638

Browse files
youknowoneyouknowone
committed
Fix nightly clippy warnings
1 parent 4be533a commit d94f638

File tree

20 files changed

+52
-72
lines changed

20 files changed

+52
-72
lines changed

‎benches/microbenchmarks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn bench_rustpy_code(group: &mut BenchmarkGroup<WallTime>, bench: &MicroBenchmar
115115
settings.no_user_site = true;
116116

117117
Interpreter::with_init(settings, |vm| {
118-
for (name, init) in rustpython_stdlib::get_module_inits().into_iter() {
118+
for (name, init) in rustpython_stdlib::get_module_inits() {
119119
vm.add_native_module(name, init);
120120
}
121121
})

‎compiler/codegen/src/compile.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ impl Compiler {
342342
self.emit(Instruction::StoreGlobal(doc))
343343
}
344344

345-
if self.find_ann(statements) {
345+
if Self::find_ann(statements) {
346346
self.emit(Instruction::SetupAnnotation);
347347
}
348348

@@ -1229,22 +1229,22 @@ impl Compiler {
12291229
}
12301230

12311231
// Python/compile.c find_ann
1232-
fn find_ann(&self, body: &[ast::Stmt]) -> bool {
1232+
fn find_ann(body: &[ast::Stmt]) -> bool {
12331233
use ast::StmtKind::*;
12341234

12351235
for statement in body {
12361236
let res = match &statement.node {
12371237
AnnAssign { .. } => true,
1238-
For { body, orelse, .. } => self.find_ann(body) || self.find_ann(orelse),
1239-
If { body, orelse, .. } => self.find_ann(body) || self.find_ann(orelse),
1240-
While { body, orelse, .. } => self.find_ann(body) || self.find_ann(orelse),
1241-
With { body, .. } => self.find_ann(body),
1238+
For { body, orelse, .. } => Self::find_ann(body) || Self::find_ann(orelse),
1239+
If { body, orelse, .. } => Self::find_ann(body) || Self::find_ann(orelse),
1240+
While { body, orelse, .. } => Self::find_ann(body) || Self::find_ann(orelse),
1241+
With { body, .. } => Self::find_ann(body),
12421242
Try {
12431243
body,
12441244
orelse,
12451245
finalbody,
12461246
..
1247-
} => self.find_ann(body) || self.find_ann(orelse) || self.find_ann(finalbody),
1247+
} => Self::find_ann(body) || Self::find_ann(orelse) || Self::find_ann(finalbody),
12481248
_ => false,
12491249
};
12501250
if res {
@@ -1295,7 +1295,7 @@ impl Compiler {
12951295
let doc = self.name("__doc__");
12961296
self.emit(Instruction::StoreLocal(doc));
12971297
// setup annotations
1298-
if self.find_ann(body) {
1298+
if Self::find_ann(body) {
12991299
self.emit(Instruction::SetupAnnotation);
13001300
}
13011301
self.compile_statements(body)?;

‎compiler/core/src/bytecode.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -996,20 +996,8 @@ impl Instruction {
996996
| SetupFinally { .. }
997997
| EnterFinally
998998
| EndFinally => 0,
999-
SetupExcept { .. } => {
1000-
if jump {
1001-
1
1002-
} else {
1003-
0
1004-
}
1005-
}
1006-
SetupWith { .. } => {
1007-
if jump {
1008-
0
1009-
} else {
1010-
1
1011-
}
1012-
}
999+
SetupExcept { .. } => jump as i32,
1000+
SetupWith { .. } => (!jump) as i32,
10131001
WithCleanupStart => 0,
10141002
WithCleanupFinish => -1,
10151003
PopBlock => 0,

‎derive/src/pyclass.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -782,12 +782,12 @@ impl ToTokens for GetSetNursery {
782782
.iter()
783783
.map(|((name, cfgs), (getter, setter, deleter))| {
784784
let setter = match setter {
785-
Some(setter) => quote_spanned! { setter.span() => .with_set(&Self::#setter)},
785+
Some(setter) => quote_spanned! { setter.span() => .with_set(Self::#setter)},
786786
None => quote! {},
787787
};
788788
let deleter = match deleter {
789789
Some(deleter) => {
790-
quote_spanned! { deleter.span() => .with_delete(&Self::#deleter)}
790+
quote_spanned! { deleter.span() => .with_delete(Self::#deleter)}
791791
}
792792
None => quote! {},
793793
};
@@ -797,7 +797,7 @@ impl ToTokens for GetSetNursery {
797797
#name,
798798
::rustpython_vm::PyRef::new_ref(
799799
::rustpython_vm::builtins::PyGetSet::new(#name.into(), class)
800-
.with_get(&Self::#getter)
800+
.with_get(Self::#getter)
801801
#setter #deleter,
802802
ctx.types.getset_type.to_owned(), None),
803803
ctx
@@ -1372,12 +1372,12 @@ fn parse_vec_ident(
13721372
Ok(attr
13731373
.get(index)
13741374
.ok_or_else(|| {
1375-
syn::Error::new_spanned(&item, format!("We require {} argument to be set", &message))
1375+
syn::Error::new_spanned(item, format!("We require {} argument to be set", &message))
13761376
})?
13771377
.get_ident()
13781378
.ok_or_else(|| {
13791379
syn::Error::new_spanned(
1380-
&item,
1380+
item,
13811381
format!("We require {} argument to be ident or string", &message),
13821382
)
13831383
})?

‎examples/generator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn py_main(interp: &Interpreter) -> vm::PyResult<()> {
1010
let generator = interp.enter(|vm| {
1111
let scope = vm.new_scope_with_builtins();
1212
let generator = vm.run_block_expr(
13-
scope.clone(),
13+
scope,
1414
r#"
1515
def gen():
1616
for i in range(10):

‎examples/package_embed.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ fn main() -> ExitCode {
1919
vm.add_native_modules(rustpython_stdlib::get_module_inits());
2020
});
2121
let result = py_main(&interp);
22-
let result = result.and_then(|result| {
22+
let result = result.map(|result| {
2323
println!("name: {}", result);
24-
Ok(())
2524
});
2625
ExitCode::from(interp.run(|_vm| result))
2726
}

‎examples/parse_folder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn main() {
3434
if folder.exists() && folder.is_dir() {
3535
println!("Parsing folder of python code: {:?}", folder);
3636
let t1 = Instant::now();
37-
let parsed_files = parse_folder(&folder).unwrap();
37+
let parsed_files = parse_folder(folder).unwrap();
3838
let t2 = Instant::now();
3939
let results = ScanResult {
4040
t1,
@@ -83,7 +83,7 @@ fn parse_python_file(filename: &Path) -> ParsedFile {
8383
result: Err(e.to_string()),
8484
},
8585
Ok(source) => {
86-
let num_lines = source.to_string().lines().count();
86+
let num_lines = source.lines().count();
8787
let result = parser::parse_program(&source, &filename.to_string_lossy())
8888
.map_err(|e| e.to_string());
8989
ParsedFile {

‎stdlib/src/mmap.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -751,10 +751,10 @@ mod mmap {
751751
.map(|n| n as usize)
752752
.unwrap_or(remaining);
753753

754-
let end_pos = (pos + num_bytes) as usize;
754+
let end_pos = pos + num_bytes;
755755
let bytes = match mmap.deref().as_ref().unwrap() {
756-
MmapObj::Read(mmap) => mmap[pos as usize..end_pos].to_vec(),
757-
MmapObj::Write(mmap) => mmap[pos as usize..end_pos].to_vec(),
756+
MmapObj::Read(mmap) => mmap[pos..end_pos].to_vec(),
757+
MmapObj::Write(mmap) => mmap[pos..end_pos].to_vec(),
758758
};
759759

760760
let result = PyBytes::from(bytes).into_ref(vm);
@@ -772,8 +772,8 @@ mod mmap {
772772
}
773773

774774
let b = match self.check_valid(vm)?.deref().as_ref().unwrap() {
775-
MmapObj::Read(mmap) => mmap[pos as usize],
776-
MmapObj::Write(mmap) => mmap[pos as usize],
775+
MmapObj::Read(mmap) => mmap[pos],
776+
MmapObj::Write(mmap) => mmap[pos],
777777
};
778778

779779
self.advance_pos(1);
@@ -805,8 +805,8 @@ mod mmap {
805805
};
806806

807807
let bytes = match mmap.deref().as_ref().unwrap() {
808-
MmapObj::Read(mmap) => mmap[pos as usize..end_pos].to_vec(),
809-
MmapObj::Write(mmap) => mmap[pos as usize..end_pos].to_vec(),
808+
MmapObj::Read(mmap) => mmap[pos..end_pos].to_vec(),
809+
MmapObj::Write(mmap) => mmap[pos..end_pos].to_vec(),
810810
};
811811

812812
let result = PyBytes::from(bytes).into_ref(vm);
@@ -891,7 +891,7 @@ mod mmap {
891891
}
892892

893893
let len = self.try_writable(vm, |mmap| {
894-
(&mut mmap[pos as usize..(pos as usize + data.len())])
894+
(&mut mmap[pos..(pos + data.len())])
895895
.write(&data)
896896
.map_err(|e| vm.new_os_error(e.to_string()))?;
897897
Ok(data.len())
@@ -914,7 +914,7 @@ mod mmap {
914914
}
915915

916916
self.try_writable(vm, |mmap| {
917-
mmap[pos as usize] = b;
917+
mmap[pos] = b;
918918
})?;
919919

920920
self.advance_pos(1);
@@ -928,8 +928,8 @@ mod mmap {
928928
.ok_or_else(|| vm.new_index_error("mmap index out of range".to_owned()))?;
929929

930930
let b = match self.check_valid(vm)?.deref().as_ref().unwrap() {
931-
MmapObj::Read(mmap) => mmap[i as usize],
932-
MmapObj::Write(mmap) => mmap[i as usize],
931+
MmapObj::Read(mmap) => mmap[i],
932+
MmapObj::Write(mmap) => mmap[i],
933933
};
934934

935935
Ok(PyInt::from(b).into_ref(vm).into())
@@ -1005,14 +1005,14 @@ mod mmap {
10051005
value: PyObjectRef,
10061006
vm: &VirtualMachine,
10071007
) -> PyResult<()> {
1008-
let i = i
1008+
let i: usize = i
10091009
.wrapped_at(zelf.len())
10101010
.ok_or_else(|| vm.new_index_error("mmap index out of range".to_owned()))?;
10111011

10121012
let b = value_from_object(vm, &value)?;
10131013

10141014
zelf.try_writable(vm, |mmap| {
1015-
mmap[i as usize] = b;
1015+
mmap[i] = b;
10161016
})?;
10171017

10181018
Ok(())

‎stdlib/src/pystruct.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub(crate) mod _struct {
8484
bytes at offset {offset} (actual buffer size is {buffer_len})",
8585
op = op,
8686
op_action = op_action,
87-
required = needed + offset as usize,
87+
required = needed + offset,
8888
needed = needed,
8989
offset = offset,
9090
buffer_len = buffer_len

‎stdlib/src/select.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ mod decl {
205205
return Ok((empty.clone(), empty.clone(), empty));
206206
}
207207

208-
let nfds = [&mut r, &mut w, &mut x]
208+
let nfds: i32 = [&mut r, &mut w, &mut x]
209209
.iter_mut()
210210
.filter_map(|set| set.highest())
211211
.max()
212-
.map_or(0, |n| n + 1) as i32;
212+
.map_or(0, |n| n + 1) as _;
213213

214214
loop {
215215
let mut tv = timeout.map(sec_to_timeval);

‎stdlib/src/socket.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ mod _socket {
11181118
}
11191119
} else {
11201120
if family == -1 {
1121-
family = c::AF_INET as i32
1121+
family = c::AF_INET as _
11221122
}
11231123
if socket_kind == -1 {
11241124
socket_kind = c::SOCK_STREAM

‎stdlib/src/termios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ mod termios {
175175
.enumerate()
176176
.map(|(i, &c)| match i {
177177
termios::VMIN | termios::VTIME if noncanon => vm.ctx.new_int(c).into(),
178-
_ => vm.ctx.new_bytes(vec![c as u8]).into(),
178+
_ => vm.ctx.new_bytes(vec![c as _]).into(),
179179
})
180180
.collect::<Vec<_>>();
181181
let out = vec![

‎vm/src/anystr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ pub trait AnyStr<'s>: 's {
379379
where
380380
FW: Fn(&Self) -> W,
381381
{
382-
let keep = if options.keepends { 1 } else { 0 };
382+
let keep = options.keepends as usize;
383383
let mut elements = Vec::new();
384384
let mut last_i = 0;
385385
let mut enumerated = self.as_bytes().iter().enumerate().peekable();

‎vm/src/builtins/complex.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ impl PyComplex {
352352
float_ops::to_string(re)
353353
};
354354
let mut result = String::with_capacity(
355-
re_part.len() + im_part.len() + 2 + if im.is_sign_positive() { 1 } else { 0 },
355+
re_part.len() + im_part.len() + 2 + im.is_sign_positive() as usize,
356356
);
357357
result.push('(');
358358
result.push_str(&re_part);

‎vm/src/builtins/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ impl PyStr {
11741174
"character mapping must be in range(0x110000)".to_owned(),
11751175
)
11761176
})?;
1177-
translated.push(ch as char);
1177+
translated.push(ch);
11781178
} else if !vm.is_none(&value) {
11791179
return Err(vm.new_type_error(
11801180
"character mapping must return integer, None or str".to_owned(),

‎vm/src/builtins/tuple.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,7 @@ impl PyTuple {
285285
vm: &VirtualMachine,
286286
) -> PyResult<usize> {
287287
let (start, stop) = range.saturate(self.len(), vm)?;
288-
for (index, element) in self
289-
.elements
290-
.iter()
291-
.enumerate()
292-
.take(stop as usize)
293-
.skip(start as usize)
294-
{
288+
for (index, element) in self.elements.iter().enumerate().take(stop).skip(start) {
295289
if vm.identical_or_equal(element, &needle)? {
296290
return Ok(index);
297291
}

‎vm/src/builtins/type.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ mod tests {
12361236
PyAttributes::default(),
12371237
Default::default(),
12381238
type_type.clone(),
1239-
&context,
1239+
context,
12401240
)
12411241
.unwrap();
12421242
let b = PyType::new_ref(
@@ -1245,7 +1245,7 @@ mod tests {
12451245
PyAttributes::default(),
12461246
Default::default(),
12471247
type_type,
1248-
&context,
1248+
context,
12491249
)
12501250
.unwrap();
12511251

‎vm/src/stdlib/io.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ mod _io {
12991299

13001300
let mut remaining = buf_len - written;
13011301
while remaining > 0 {
1302-
let n = if remaining as usize > self.buffer.len() {
1302+
let n = if remaining > self.buffer.len() {
13031303
self.raw_read(Either::B(buf.clone()), written..written + remaining, vm)?
13041304
} else if !(readinto1 && written != 0) {
13051305
let n = self.fill_buffer(vm)?;
@@ -4012,7 +4012,7 @@ mod fileio {
40124012
}
40134013
let mut handle = self.get_fd(vm)?;
40144014
let bytes = if let Some(read_byte) = read_byte.to_usize() {
4015-
let mut bytes = vec![0; read_byte as usize];
4015+
let mut bytes = vec![0; read_byte];
40164016
let n = handle
40174017
.read(&mut bytes)
40184018
.map_err(|err| err.to_pyexception(vm))?;

0 commit comments

Comments
 (0)