Add type annotations for new inference ambiguities

Reviewed By: JakobDegen Differential Revision: D51780425 fbshipit-source-id: 0ae1af16f3693fbd7e52d1ba56114dc0b3b37375
ahornby · Dec 2, 2023 · b731396 · b731396
1 parent 6d6b525
commit b731396
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/eden/mononoke/blobstore/sqlblob/src/tests.rs b/eden/mononoke/blobstore/sqlblob/src/tests.rs
@@ -343,7 +343,11 @@ async fn generations(fb: FacebookInit) -> Result<(), Error> {
                     value_len
                 );
             } else {
-                assert_eq!(generations, vec![], "No generations expected");
+                assert_eq!(
+                    generations,
+                    [] as [Option<u64>; 0],
+                    "No generations expected",
+                );
             }
 
             let mark_gen = set_test_generations(test_source.as_ref(), 4, 3, 0, INITIAL_VERSION + 1);
@@ -357,7 +361,11 @@ async fn generations(fb: FacebookInit) -> Result<(), Error> {
                 assert_eq!(generations, vec![Some(3)], "Generation set to 3");
             } else {
                 // We should now have no generations as the set_generation(key, true) should have inlined
-                assert_eq!(generations, vec![], "No generations expected");
+                assert_eq!(
+                    generations,
+                    [] as [Option<u64>; 0],
+                    "No generations expected",
+                );
             }
 
             // don't need to run these with variety of key lengths

diff --git a/eden/mononoke/bonsai_git_mapping/src/lib.rs b/eden/mononoke/bonsai_git_mapping/src/lib.rs
@@ -202,7 +202,7 @@ where
         }
     }
 
-    if hggit_source_extra == Some(b"git") {
+    if hggit_source_extra == Some("git".as_bytes()) {
         if let Some(convert_revision_extra) = convert_revision_extra {
             let git_sha1 = AsciiStr::from_ascii(convert_revision_extra)?;
             let git_sha1 = GitSha1::from_ascii_str(git_sha1)?;

diff --git a/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs b/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs
@@ -1135,7 +1135,7 @@ async fn compare_contents(
         "source content: {:?}, target content {:?}",
         source_content, target_content
     );
-    let filtered_source_content = source_content
+    let filtered_source_content: HashMap<_, _> = source_content
         .into_iter()
         .filter_map(|(key, value)| {
             mover(&NonRootMPath::new(key).unwrap())

diff --git a/eden/mononoke/derived_data/deleted_manifest/test_utils.rs b/eden/mononoke/derived_data/deleted_manifest/test_utils.rs
@@ -658,7 +658,7 @@ pub(crate) async fn test_find_entries<Root: RootDeletedManifestIdCommon>(
                 .unwrap();
 
             entries.sort();
-            let expected_entries = vec![path("dir/f-2").into(), path("dir/sub/f-1").into()];
+            let expected_entries = [Some(path("dir/f-2")), Some(path("dir/sub/f-1"))];
             assert_eq!(entries, expected_entries);
         }