refactor

Author: Byron

git-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b034a569959fd83c39e7aa870fea63b5fd8b87b5665e65881fade92592fc2c3
+oid sha256:5acb6a5de229b312880af9847cefa54ccb8385f4273f0bb365f2af66dd789f0f
 size 11040

git-index/tests/fixtures/make_index/v2_all_file_kinds.sh

@@ -4,13 +4,12 @@ set -eu -o pipefail
 export GIT_INDEX_VERSION=2;
 
 git init -q sub
-cd sub
+(cd sub
 
-touch a b c
-git add .
-git commit -m "empty"
-
-cd ..
+  touch a b c
+  git add .
+  git commit -m "init"
+)
 
 git init -q
 git config index.threads 1
@@ -22,4 +21,4 @@ mkdir d
 (cd d && touch a b c)
 
 git add .
-git commit -m "empty"
+git commit -m "init"

git-index/tests/index/init.rs

@@ -38,10 +38,10 @@ fn compare_states(actual: &State, expected: &State, fixture: &str) {
         fixture
     );
 
-    actual.entries().iter().zip(expected.entries()).for_each(|(a, e)| {
+    for (a, e) in actual.entries().iter().zip(expected.entries()) {
         assert_eq!(a.id, e.id, "entry id mismatch in {:?}", fixture);
         assert_eq!(a.flags, e.flags, "entry flags mismatch in {:?}", fixture);
         assert_eq!(a.mode, e.mode, "entry mode mismatch in {:?}", fixture);
         assert_eq!(a.path(actual), e.path(expected), "entry path mismatch in {:?}", fixture);
-    })
+    }
 }

git-pathspec/tests/pathspec.rs

@@ -284,7 +284,7 @@ mod parse {
                 ":_()", ":`()", ":~()",
             ];
 
-            inputs.into_iter().for_each(|input| {
+            for input in inputs.into_iter() {
                 assert!(
                     !check_against_baseline(input),
                     "This pathspec is valid in git: {}",
@@ -294,7 +294,7 @@ mod parse {
                 let output = git_pathspec::parse(input.as_bytes());
                 assert!(output.is_err());
                 assert!(matches!(output.unwrap_err(), Error::Unimplemented { .. }));
-            });
+            }
         }
 
         #[test]
@@ -306,7 +306,7 @@ mod parse {
                 ":(top,exclude,icse)some/path",
             ];
 
-            inputs.into_iter().for_each(|input| {
+            for input in inputs.into_iter() {
                 assert!(
                     !check_against_baseline(input),
                     "This pathspec is valid in git: {}",
@@ -316,7 +316,7 @@ mod parse {
                 let output = git_pathspec::parse(input.as_bytes());
                 assert!(output.is_err());
                 assert!(matches!(output.unwrap_err(), Error::InvalidKeyword { .. }));
-            });
+            }
         }
 
         #[test]
@@ -454,7 +454,7 @@ mod parse {
     }
 
     fn check_valid_inputs<'a>(inputs: impl IntoIterator<Item = (&'a str, PatternForTesting)>) {
-        inputs.into_iter().for_each(|(input, expected)| {
+        for (input, expected) in inputs.into_iter() {
             assert!(
                 check_against_baseline(input),
                 "This pathspec is invalid in git: {}",
@@ -465,7 +465,7 @@ mod parse {
                 .unwrap_or_else(|_| panic!("parsing should not fail with pathspec {}", input))
                 .into();
             assert_eq!(pattern, expected, "while checking input: \"{}\"", input);
-        });
+        }
     }
 
     fn pat_with_path(path: &str) -> PatternForTesting {