From f54c9b261e01b2e250027c22e013d1974e3d7547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 30 May 2023 10:07:49 +0300 Subject: [PATCH] Fix a couple of trivial clippy warnings --- cairo/src/svg.rs | 3 ++- glib/src/translate.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cairo/src/svg.rs b/cairo/src/svg.rs index d63accd96d9c..0662f2bdb4d4 100644 --- a/cairo/src/svg.rs +++ b/cairo/src/svg.rs @@ -146,10 +146,11 @@ mod test { *surface.finish_output_stream().unwrap().downcast().unwrap() } + #[track_caller] fn assert_len_close_enough(len_a: usize, len_b: usize) { // It seems cairo randomizes some element IDs which might make one svg slightly // larger than the other. Here we make sure the difference is within ~10%. - let len_diff = (len_a as isize - len_b as isize).abs() as usize; + let len_diff = usize::abs_diff(len_a, len_b); assert!(len_diff < len_b / 10); } diff --git a/glib/src/translate.rs b/glib/src/translate.rs index 760be8115a59..11cfec05f01b 100644 --- a/glib/src/translate.rs +++ b/glib/src/translate.rs @@ -958,7 +958,7 @@ macro_rules! impl_to_glib_container_from_slice_fundamental { } unsafe { - let res = ffi::g_malloc(mem::size_of::<$name>() * t.len()) as *mut $name; + let res = ffi::g_malloc(mem::size_of_val(t)) as *mut $name; ptr::copy_nonoverlapping(t.as_ptr(), res, t.len()); res }