Eliminate unreachable branch

time-rs · Mar 30, 2024 · f04a28f · f04a28f
1 parent 06a096d
commit f04a28f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/time-macros/src/format_description/format_item.rs b/time-macros/src/format_description/format_item.rs
@@ -102,14 +102,9 @@ impl From<Item<'_>> for crate::format_description::public::OwnedFormatItem {
 impl<'a> From<Box<[Item<'a>]>> for crate::format_description::public::OwnedFormatItem {
     fn from(items: Box<[Item<'a>]>) -> Self {
         let items = items.into_vec();
-        if items.len() == 1 {
-            if let Ok([item]) = <[_; 1]>::try_from(items) {
-                item.into()
-            } else {
-                bug!("the length was just checked to be 1")
-            }
-        } else {
-            Self::Compound(items.into_iter().map(Self::from).collect())
+        match <[_; 1]>::try_from(items) {
+            Ok([item]) => item.into(),
+            Err(vec) => Self::Compound(vec.into_iter().map(Into::into).collect()),
         }
     }
 }

diff --git a/time/src/format_description/parse/format_item.rs b/time/src/format_description/parse/format_item.rs
@@ -149,14 +149,9 @@ impl From<Item<'_>> for crate::format_description::OwnedFormatItem {
 impl<'a> From<Box<[Item<'a>]>> for crate::format_description::OwnedFormatItem {
     fn from(items: Box<[Item<'a>]>) -> Self {
         let items = items.into_vec();
-        if items.len() == 1 {
-            if let Ok([item]) = <[_; 1]>::try_from(items) {
-                item.into()
-            } else {
-                bug!("the length was just checked to be 1")
-            }
-        } else {
-            Self::Compound(items.into_iter().map(Self::from).collect())
+        match <[_; 1]>::try_from(items) {
+            Ok([item]) => item.into(),
+            Err(vec) => Self::Compound(vec.into_iter().map(Into::into).collect()),
         }
     }
 }