chore: appease clippy

Arguably, go a bit further than what clippy wants, and replace all
NonZero*::new_unchecked() with calls to .new().unwrap(). The expression
is const, so has no runtime impact, and uses less unsafe.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/bitmap/backend/atomic_bitmap.rs

@@ -184,7 +184,7 @@ impl Bitmap for AtomicBitmap {
 impl Default for AtomicBitmap {
     fn default() -> Self {
         // SAFETY: Safe as `0x1000` is non-zero.
-        AtomicBitmap::new(0, unsafe { NonZeroUsize::new_unchecked(0x1000) })
+        AtomicBitmap::new(0, const { NonZeroUsize::new(0x1000).unwrap() })
     }
 }
 
@@ -221,7 +221,7 @@ mod tests {
     use crate::bitmap::tests::test_bitmap;
 
     #[allow(clippy::undocumented_unsafe_blocks)]
-    const DEFAULT_PAGE_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(128) };
+    const DEFAULT_PAGE_SIZE: NonZeroUsize = NonZeroUsize::new(128).unwrap();
 
     #[test]
     fn test_bitmap_basic() {

src/bitmap/backend/atomic_bitmap_arc.rs

@@ -78,9 +78,7 @@ mod tests {
     #[test]
     fn test_bitmap_impl() {
         // SAFETY: `128` is non-zero.
-        let b = AtomicBitmapArc::new(AtomicBitmap::new(0x800, unsafe {
-            NonZeroUsize::new_unchecked(128)
-        }));
+        let b = AtomicBitmapArc::new(AtomicBitmap::new(0x800, NonZeroUsize::new(128).unwrap()));
         test_bitmap(&b);
     }
 }

src/mmap/unix.rs

@@ -247,7 +247,7 @@ impl<B: NewBitmap> MmapRegion<B> {
     ///
     /// # Arguments
     /// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
-    ///                   referred to by `file_offset.file`.
+    ///   referred to by `file_offset.file`.
     /// * `size` - The size of the memory region in bytes.
     pub fn from_file(file_offset: FileOffset, size: usize) -> Result<Self> {
         MmapRegionBuilder::new_with_bitmap(size, B::with_len(size))
@@ -261,12 +261,12 @@ impl<B: NewBitmap> MmapRegion<B> {
     ///
     /// # Arguments
     /// * `file_offset` - if provided, the method will create a file mapping at offset
-    ///                   `file_offset.start` in the file referred to by `file_offset.file`.
+    ///   `file_offset.start` in the file referred to by `file_offset.file`.
     /// * `size` - The size of the memory region in bytes.
     /// * `prot` - The desired memory protection of the mapping.
     /// * `flags` - This argument determines whether updates to the mapping are visible to other
-    ///             processes mapping the same region, and whether updates are carried through to
-    ///             the underlying file.
+    ///   processes mapping the same region, and whether updates are carried through to
+    ///   the underlying file.
     pub fn build(
         file_offset: Option<FileOffset>,
         size: usize,
@@ -293,7 +293,7 @@ impl<B: NewBitmap> MmapRegion<B> {
     /// * `size` - The size of the memory region in bytes.
     /// * `prot` - Must correspond to the memory protection attributes of the existing mapping.
     /// * `flags` - Must correspond to the flags that were passed to `mmap` for the creation of
-    ///             the existing mapping.
+    ///   the existing mapping.
     ///
     /// # Safety
     ///
@@ -587,9 +587,7 @@ mod tests {
         assert!(r.owned());
 
         let region_size = 0x10_0000;
-        let bitmap = AtomicBitmap::new(region_size, unsafe {
-            std::num::NonZeroUsize::new_unchecked(0x1000)
-        });
+        let bitmap = AtomicBitmap::new(region_size, std::num::NonZeroUsize::new(0x1000).unwrap());
         let builder = MmapRegionBuilder::new_with_bitmap(region_size, bitmap)
             .with_hugetlbfs(true)
             .with_mmap_prot(libc::PROT_READ | libc::PROT_WRITE);

src/region.rs

@@ -219,8 +219,8 @@ impl<R: GuestMemoryRegion> GuestRegionCollection<R> {
     /// # Arguments
     ///
     /// * `regions` - The vector of regions.
-    ///               The regions shouldn't overlap, and they should be sorted
-    ///               by the starting address.
+    ///   The regions shouldn't overlap, and they should be sorted
+    ///   by the starting address.
     pub fn from_regions(
         mut regions: Vec<R>,
     ) -> std::result::Result<Self, GuestRegionCollectionError> {
@@ -237,8 +237,8 @@ impl<R: GuestMemoryRegion> GuestRegionCollection<R> {
     /// # Arguments
     ///
     /// * `regions` - The vector of `Arc` regions.
-    ///               The regions shouldn't overlap and they should be sorted
-    ///               by the starting address.
+    ///   The regions shouldn't overlap and they should be sorted
+    ///   by the starting address.
     pub fn from_arc_regions(
         regions: Vec<Arc<R>>,
     ) -> std::result::Result<Self, GuestRegionCollectionError> {

src/volatile_memory.rs

@@ -1469,7 +1469,7 @@ mod tests {
     use crate::bitmap::{AtomicBitmap, RefSlice};
 
     #[cfg(feature = "backend-bitmap")]
-    const DEFAULT_PAGE_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(0x1000) };
+    const DEFAULT_PAGE_SIZE: NonZeroUsize = NonZeroUsize::new(0x1000).unwrap();
 
     #[test]
     fn test_compute_end_offset() {