Replace unwrap() with alternatives to avoid panics

refactor-group · Jan 13, 2023 · 3d26ef9 · 3d26ef9
1 parent 627ad51
commit 3d26ef9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/esp32-wroom-rp/src/protocol.rs b/esp32-wroom-rp/src/protocol.rs
@@ -207,7 +207,7 @@ impl NinaConcreteParam for NinaByteParam {
 
     fn from_bytes(bytes: &[u8]) -> Self {
         let mut data_as_bytes: Vec<u8, 1> = Vec::new();
-        data_as_bytes.extend_from_slice(bytes).ok().unwrap();
+        data_as_bytes.extend_from_slice(bytes).unwrap_or_default();
         Self {
             length: data_as_bytes.len() as u8,
             data: data_as_bytes,
@@ -240,7 +240,7 @@ impl NinaConcreteParam for NinaWordParam {
 
     fn from_bytes(bytes: &[u8]) -> Self {
         let mut data_as_bytes: Vec<u8, 2> = Vec::new();
-        data_as_bytes.extend_from_slice(bytes).ok().unwrap();
+        data_as_bytes.extend_from_slice(bytes).unwrap_or_default();
         Self {
             length: data_as_bytes.len() as u8,
             data: data_as_bytes,
@@ -273,7 +273,7 @@ impl NinaConcreteParam for NinaSmallArrayParam {
 
     fn from_bytes(bytes: &[u8]) -> Self {
         let mut data_as_bytes: Vec<u8, MAX_NINA_PARAM_LENGTH> = Vec::new();
-        data_as_bytes.extend_from_slice(bytes).ok().unwrap();
+        data_as_bytes.extend_from_slice(bytes).unwrap_or_default();
         Self {
             length: data_as_bytes.len() as u8,
             data: data_as_bytes,
@@ -306,7 +306,7 @@ impl NinaConcreteParam for NinaLargeArrayParam {
 
     fn from_bytes(bytes: &[u8]) -> Self {
         let mut data_as_bytes: Vec<u8, MAX_NINA_PARAM_LENGTH> = Vec::new();
-        data_as_bytes.extend_from_slice(bytes).ok().unwrap();
+        data_as_bytes.extend_from_slice(bytes).unwrap_or_default();
         Self {
             length: data_as_bytes.len() as u16,
             data: data_as_bytes,

diff --git a/esp32-wroom-rp/src/protocol/operation.rs b/esp32-wroom-rp/src/protocol/operation.rs
@@ -26,7 +26,7 @@ impl Operation<NinaAbstractParam> {
     // on the data bus.
     pub fn param(mut self, param: NinaAbstractParam) -> Self {
         // FIXME: Vec::push() will return T when it is full, handle this gracefully
-        self.params.push(param).ok().unwrap();
+        self.params.push(param).unwrap_or(());
         self
     }
 }
diff --git a/esp32-wroom-rp/src/tcp_client.rs b/esp32-wroom-rp/src/tcp_client.rs
@@ -198,7 +198,6 @@ where
             ip = self
                 .protocol_handler
                 .resolve(hostname.as_str())
-                .ok()
                 .unwrap_or_default();
         }