Merge branch 'main' into deprecation-cleanup

Author: roypat

.buildkite/custom-tests.json

@@ -22,7 +22,7 @@
     },
     {
       "test_name": "miri",
-      "command": "RUST_BACKTRACE=1 MIRIFLAGS='-Zmiri-disable-isolation -Zmiri-panic-on-unsupported -Zmiri-backtrace=full' cargo +nightly miri test --features backend-mmap",
+      "command": "RUST_BACKTRACE=1 MIRIFLAGS='-Zmiri-disable-isolation -Zmiri-backtrace=full' cargo +nightly miri test --features backend-mmap",
       "platform": ["x86_64", "aarch64"]
     },
     {

rust-vmm-ci

@@ -26,7 +26,7 @@ impl<B> BaseSlice<B> {
     }
 }
 
-impl<'a, B> WithBitmapSlice<'a> for BaseSlice<B>
+impl<B> WithBitmapSlice<'_> for BaseSlice<B>
 where
     B: Clone + Deref,
     B::Target: Bitmap,

src/bitmap/backend/slice.rs

@@ -49,8 +49,7 @@ pub trait Bitmap: for<'a> WithBitmapSlice<'a> {
 
 /// A no-op `Bitmap` implementation that can be provided for backends that do not actually
 /// require the tracking functionality.
-
-impl<'a> WithBitmapSlice<'a> for () {
+impl WithBitmapSlice<'_> for () {
     type S = Self;
 }
 
@@ -67,7 +66,6 @@ impl Bitmap for () {
 }
 
 /// A `Bitmap` and `BitmapSlice` implementation for `Option<B>`.
-
 impl<'a, B> WithBitmapSlice<'a> for Option<B>
 where
     B: WithBitmapSlice<'a>,

src/bitmap/mod.rs

@@ -489,7 +489,7 @@ fn page_size() -> u64 {
 
 fn pages(size: usize) -> (usize, usize) {
     let page_size = page_size() as usize;
-    let num = (size + page_size - 1) / page_size;
+    let num = size.div_ceil(page_size);
 
     (num, page_size * num)
 }

src/mmap_xen.rs

@@ -886,7 +886,7 @@ pub struct VolatileRef<'a, T, B = ()> {
     mmap: Option<&'a MmapInfo>,
 }
 
-impl<'a, T> VolatileRef<'a, T, ()>
+impl<T> VolatileRef<'_, T, ()>
 where
     T: ByteValued,
 {
@@ -1017,7 +1017,7 @@ pub struct VolatileArrayRef<'a, T, B = ()> {
     mmap: Option<&'a MmapInfo>,
 }
 
-impl<'a, T> VolatileArrayRef<'a, T>
+impl<T> VolatileArrayRef<'_, T>
 where
     T: ByteValued,
 {