Use fewer unwraps

Co-authored-by: Ruben De Smet <[email protected]>
whisperfish · May 25, 2024 · 6a1ef09 · 6a1ef09
1 parent 741611d
commit 6a1ef09
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libsignal-service/src/service_address.rs b/libsignal-service/src/service_address.rs
@@ -69,9 +69,9 @@ impl TryFrom<&[u8]> for ServiceAddress {
     type Error = ParseServiceAddressError;
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        if value.starts_with(b"PNI:") {
+        if let Some(pni) = value.strip_prefix(b"PNI:") {
             Ok(ServiceAddress {
-                uuid: Uuid::from_slice(value.strip_prefix(b"PNI:").unwrap())?,
+                uuid: Uuid::from_slice(pni)?,
                 identity: ServiceIdType::PhoneNumberIdentity,
             })
         } else {