Substitue unwrap calls for passing up None

Author: DrChat

gdbstub_arch/src/arm/reg/id.rs

@@ -33,6 +33,6 @@ impl RegId for ArmCoreRegId {
             25 => Self::Cpsr,
             _ => return None,
         };
-        Some((reg, Some(NonZeroUsize::new(4).unwrap())))
+        Some((reg, Some(NonZeroUsize::new(4)?)))
     }
 }

gdbstub_arch/src/mips/reg/id.rs

@@ -71,7 +71,7 @@ fn from_raw_id<U>(id: usize) -> Option<(MipsRegId<U>, Option<NonZeroUsize>)> {
     };
 
     let ptrsize = core::mem::size_of::<U>();
-    Some((reg, Some(NonZeroUsize::new(ptrsize).unwrap())))
+    Some((reg, Some(NonZeroUsize::new(ptrsize)?)))
 }
 
 impl RegId for MipsRegId<u32> {

gdbstub_arch/src/msp430/reg/id.rs

@@ -31,7 +31,7 @@ impl RegId for Msp430RegId {
             4..=15 => Self::Gpr((id as u8) - 4),
             _ => return None,
         };
-        Some((reg, Some(NonZeroUsize::new(2).unwrap())))
+        Some((reg, Some(NonZeroUsize::new(2)?)))
     }
 }
 

gdbstub_arch/src/riscv/reg/id.rs

@@ -36,7 +36,7 @@ macro_rules! impl_riscv_reg_id {
                     _ => return None,
                 };
 
-                Some((id, Some(NonZeroUsize::new(size).unwrap())))
+                Some((id, Some(NonZeroUsize::new(size)?)))
             }
         }
     };

gdbstub_arch/src/x86/reg/id.rs

@@ -139,7 +139,7 @@ impl RegId for X86CoreRegId {
             _ => return None,
         };
 
-        Some((r, Some(NonZeroUsize::new(sz).unwrap())))
+        Some((r, Some(NonZeroUsize::new(sz)?)))
     }
 }
 
@@ -185,7 +185,7 @@ impl RegId for X86_64CoreRegId {
             _ => return None,
         };
 
-        Some((r, Some(NonZeroUsize::new(sz).unwrap())))
+        Some((r, Some(NonZeroUsize::new(sz)?)))
     }
 }