refactor: use const Option::unwrap (!)

Author: ErichDonGubler

naga/src/proc/layouter.rs

@@ -9,11 +9,11 @@ use crate::arena::{Handle, HandleVec};
 pub struct Alignment(NonZeroU32);
 
 impl Alignment {
-    pub const ONE: Self = Self(unsafe { NonZeroU32::new_unchecked(1) });
-    pub const TWO: Self = Self(unsafe { NonZeroU32::new_unchecked(2) });
-    pub const FOUR: Self = Self(unsafe { NonZeroU32::new_unchecked(4) });
-    pub const EIGHT: Self = Self(unsafe { NonZeroU32::new_unchecked(8) });
-    pub const SIXTEEN: Self = Self(unsafe { NonZeroU32::new_unchecked(16) });
+    pub const ONE: Self = Self(NonZeroU32::new(1).unwrap());
+    pub const TWO: Self = Self(NonZeroU32::new(2).unwrap());
+    pub const FOUR: Self = Self(NonZeroU32::new(4).unwrap());
+    pub const EIGHT: Self = Self(NonZeroU32::new(8).unwrap());
+    pub const SIXTEEN: Self = Self(NonZeroU32::new(16).unwrap());
 
     pub const MIN_UNIFORM: Self = Self::SIXTEEN;
 

wgpu-core/src/indirect_validation.rs

@@ -85,16 +85,12 @@ impl IndirectValidation {
         "
         );
 
-        // SAFETY: The value we are passing to `new_unchecked` is not zero, so this is safe.
-        const SRC_BUFFER_SIZE: NonZeroU64 =
-            unsafe { NonZeroU64::new_unchecked(size_of::<u32>() as u64 * 3) };
+        const SRC_BUFFER_SIZE: NonZeroU64 = NonZeroU64::new(size_of::<u32>() as u64 * 3).unwrap();
 
-        // SAFETY: The value we are passing to `new_unchecked` is not zero, so this is safe.
-        const DST_BUFFER_SIZE: NonZeroU64 = unsafe {
-            NonZeroU64::new_unchecked(
-                SRC_BUFFER_SIZE.get() * 2, // From above: `dst: array<u32, 6>`
-            )
-        };
+        const DST_BUFFER_SIZE: NonZeroU64 = NonZeroU64::new(
+            SRC_BUFFER_SIZE.get() * 2, // From above: `dst: array<u32, 6>`
+        )
+        .unwrap();
 
         let module = naga::front::wgsl::parse_str(&src).map_err(|inner| {
             CreateShaderModuleError::Parsing(naga::error::ShaderError {