refactor

fjall-rs · Mar 21, 2024 · 3e79d06 · 3e79d06
1 parent bef00cc
commit 3e79d06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/merge.rs b/src/merge.rs
@@ -262,13 +262,13 @@ mod tests {
 
     #[test]
     fn test_snapshot_iter() -> crate::Result<()> {
-        let vec0 = vec![
+        let vec0 = [
             crate::Value::new(1u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"old", 0, ValueType::Value),
         ];
 
-        let vec1 = vec![
+        let vec1 = [
             crate::Value::new(1u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"new", 1, ValueType::Value),
@@ -350,13 +350,13 @@ mod tests {
 
     #[test]
     fn test_mixed() -> crate::Result<()> {
-        let vec0 = vec![
+        let vec0 = [
             crate::Value::new(1u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"new", 2, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"old", 0, ValueType::Value),
         ];
 
-        let vec1 = vec![
+        let vec1 = [
             crate::Value::new(1u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"new", 1, ValueType::Value),
@@ -382,13 +382,13 @@ mod tests {
 
     #[test]
     fn test_forward_merge() -> crate::Result<()> {
-        let vec0 = vec![
+        let vec0 = [
             crate::Value::new(1u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"old", 0, ValueType::Value),
         ];
 
-        let vec1 = vec![
+        let vec1 = [
             crate::Value::new(1u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"new", 1, ValueType::Value),
@@ -414,13 +414,13 @@ mod tests {
 
     #[test]
     fn test_forward_tombstone_shadowing() -> crate::Result<()> {
-        let vec0 = vec![
+        let vec0 = [
             crate::Value::new(1u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"old", 0, ValueType::Value),
         ];
 
-        let vec1 = vec![
+        let vec1 = [
             crate::Value::new(1u64.to_be_bytes(), *b"", 1, ValueType::Tombstone),
             crate::Value::new(2u64.to_be_bytes(), *b"", 1, ValueType::Tombstone),
             crate::Value::new(3u64.to_be_bytes(), *b"", 1, ValueType::Tombstone),
@@ -446,13 +446,13 @@ mod tests {
 
     #[test]
     fn test_rev_merge() -> crate::Result<()> {
-        let vec0 = vec![
+        let vec0 = [
             crate::Value::new(1u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"old", 0, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"old", 0, ValueType::Value),
         ];
 
-        let vec1 = vec![
+        let vec1 = [
             crate::Value::new(1u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(2u64.to_be_bytes(), *b"new", 1, ValueType::Value),
             crate::Value::new(3u64.to_be_bytes(), *b"new", 1, ValueType::Value),

diff --git a/src/version.rs b/src/version.rs
@@ -39,14 +39,10 @@ impl Version {
     }
 
     pub fn parse_file_header(bytes: &[u8]) -> Option<Self> {
-        let Some(first_three) = bytes.get(0..3) else {
-            return None;
-        };
+        let first_three = bytes.get(0..3)?;
 
         if first_three == MAGIC_BYTES {
-            let Some(next_two) = bytes.get(3..5) else {
-                return None;
-            };
+            let next_two = bytes.get(3..5)?;
 
             let mut bytes = [0; 2];
             bytes.copy_from_slice(next_two);