Skip to content

Commit 19e0c3f

Browse files
committed
Clippy.
1 parent 2715c70 commit 19e0c3f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

crates/processing_ffi/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ pub extern "C" fn processing_input_focus(surface_id: u64, focused: bool) {
14521452
#[unsafe(no_mangle)]
14531453
pub extern "C" fn processing_input_flush() {
14541454
error::clear_error();
1455-
error::check(|| input_flush());
1455+
error::check(input_flush);
14561456
}
14571457

14581458
#[unsafe(no_mangle)]
@@ -1482,7 +1482,7 @@ pub extern "C" fn processing_pmouse_y(surface_id: u64) -> f32 {
14821482
#[unsafe(no_mangle)]
14831483
pub extern "C" fn processing_mouse_is_pressed() -> bool {
14841484
error::clear_error();
1485-
error::check(|| input_mouse_is_pressed()).unwrap_or(false)
1485+
error::check(input_mouse_is_pressed).unwrap_or(false)
14861486
}
14871487

14881488
#[unsafe(no_mangle)]
@@ -1502,7 +1502,7 @@ pub extern "C" fn processing_mouse_button() -> i8 {
15021502
#[unsafe(no_mangle)]
15031503
pub extern "C" fn processing_key_is_pressed() -> bool {
15041504
error::clear_error();
1505-
error::check(|| input_key_is_pressed()).unwrap_or(false)
1505+
error::check(input_key_is_pressed).unwrap_or(false)
15061506
}
15071507

15081508
#[unsafe(no_mangle)]
@@ -1530,19 +1530,19 @@ pub extern "C" fn processing_key_code() -> u32 {
15301530
#[unsafe(no_mangle)]
15311531
pub extern "C" fn processing_moved_x() -> f32 {
15321532
error::clear_error();
1533-
error::check(|| input_moved_x()).unwrap_or(0.0)
1533+
error::check(input_moved_x).unwrap_or(0.0)
15341534
}
15351535

15361536
#[unsafe(no_mangle)]
15371537
pub extern "C" fn processing_moved_y() -> f32 {
15381538
error::clear_error();
1539-
error::check(|| input_moved_y()).unwrap_or(0.0)
1539+
error::check(input_moved_y).unwrap_or(0.0)
15401540
}
15411541

15421542
#[unsafe(no_mangle)]
15431543
pub extern "C" fn processing_mouse_wheel() -> f32 {
15441544
error::clear_error();
1545-
error::check(|| input_mouse_wheel()).unwrap_or(0.0)
1545+
error::check(input_mouse_wheel).unwrap_or(0.0)
15461546
}
15471547

15481548
fn key_code_from_u32(val: u32) -> processing::prelude::error::Result<KeyCode> {

crates/processing_pyo3/src/math.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,15 @@ macro_rules! impl_py_vec {
269269

270270
fn __getitem__(&self, idx: isize) -> PyResult<f32> {
271271
let idx = if idx < 0 { $n as isize + idx } else { idx };
272-
if idx < 0 || idx >= $n {
272+
if !(0..$n as isize).contains(&idx) {
273273
return Err(PyTypeError::new_err("index out of range"));
274274
}
275275
Ok(self.0[idx as usize])
276276
}
277277

278278
fn __setitem__(&mut self, idx: isize, val: f32) -> PyResult<()> {
279279
let idx = if idx < 0 { $n as isize + idx } else { idx };
280-
if idx < 0 || idx >= $n {
280+
if !(0..$n as isize).contains(&idx) {
281281
return Err(PyTypeError::new_err("index out of range"));
282282
}
283283
self.0[idx as usize] = val;

0 commit comments

Comments
 (0)