riscv: apply review suggestions

Author: 0xllx0

riscv/src/register/mvien.rs

@@ -53,13 +53,10 @@ impl Mvien {
     ///
     /// Returns `Error` if the interrupt number is invalid.
     #[inline]
-    pub fn is_enabled<I: InterruptNumber>(&self, interrupt: I) -> Result<bool> {
+    pub fn is_enabled<I: InterruptNumber>(&self, interrupt: I) -> bool {
         let n = interrupt.number();
-        if Self::is_valid_interrupt(n) {
-            Ok(bf_extract(self.bits, n, 1) != 0)
-        } else {
-            Err(Error::InvalidVariant(n))
-        }
+
+        Self::is_valid_interrupt(n) && bf_extract(self.bits, n, 1) != 0
     }
 
     /// Enable a specific core interrupt source.
@@ -148,13 +145,13 @@ mod tests {
         (0..=VirtualInterrupt::MAX_INTERRUPT_NUMBER)
             .filter_map(|n| VirtualInterrupt::from_number(n).ok())
             .for_each(|int| {
-                assert_eq!(m.is_enabled(int), Ok(false));
+                assert!(!m.is_enabled(int));
 
                 assert!(m.enable(int).is_ok());
-                assert_eq!(m.is_enabled(int), Ok(true));
+                assert!(m.is_enabled(int));
 
                 assert!(m.disable(int).is_ok());
-                assert_eq!(m.is_enabled(int), Ok(false));
+                assert!(!m.is_enabled(int));
             });
     }
 }

riscv/src/register/mvienh.rs

@@ -37,14 +37,10 @@ impl Mvienh {
     ///
     /// Returns `Error` if the interrupt number is invalid.
     #[inline]
-    pub fn is_enabled<I: InterruptNumber>(&self, interrupt: I) -> Result<bool> {
+    pub fn is_enabled<I: InterruptNumber>(&self, interrupt: I) -> bool {
         let n = interrupt.number();
 
-        if Self::is_valid_interrupt(n) {
-            Ok(bf_extract(self.bits, Self::shift_interrupt(n), 1) != 0)
-        } else {
-            Err(Error::InvalidVariant(n))
-        }
+        Self::is_valid_interrupt(n) && bf_extract(self.bits, Self::shift_interrupt(n), 1) != 0
     }
 
     /// Enable a specific core interrupt source.
@@ -110,13 +106,13 @@ mod tests {
         (Mvienh::MIN_INTERRUPT..=Mvienh::MAX_INTERRUPT)
             .filter_map(|n| VirtualInterrupt::from_number(n).ok())
             .for_each(|int| {
-                assert_eq!(m.is_enabled(int), Ok(false));
+                assert!(!m.is_enabled(int));
 
                 assert!(m.enable(int).is_ok());
-                assert_eq!(m.is_enabled(int), Ok(true));
+                assert!(m.is_enabled(int));
 
                 assert!(m.disable(int).is_ok());
-                assert_eq!(m.is_enabled(int), Ok(false));
+                assert!(!m.is_enabled(int));
             });
     }
 }