Skip to content

Commit 5f4fae6

Browse files
codexByron
authored andcommitted
Fix PR CI fallout
The PR CI lint job failed with clippy::semicolon-if-nothing-returned in gix-status/tests/status/index_as_worktree.rs after the keep-tree-cache call was expanded into a block closure. Add the requested semicolon so the closure has an explicit unit statement. The fast-test matrix also failed after tests regenerated gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar and git diff reported the archive had changed. The archive still carried an older fixture identity, so regenerate it from the current v2_deeper_tree fixture script identity to prevent CI from rewriting it.
1 parent d3c7ba9 commit 5f4fae6

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

Binary file not shown.

gix-index/tests/index/init.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,10 @@ fn to_tree_rejects_missing_objects_unless_allowed() -> crate::Result {
154154
let err = state.to_tree(&objects, Default::default()).unwrap_err();
155155
assert!(matches!(err, gix_index::init::to_tree::Error::MissingObject { .. }));
156156

157-
let mut options = gix_index::init::to_tree::Options::default();
158-
options.missing_ok = true;
157+
let options = gix_index::init::to_tree::Options {
158+
missing_ok: true,
159+
..Default::default()
160+
};
159161
let actual = state.to_tree(&objects, options)?;
160162
assert_ne!(actual, gix_hash::Kind::Sha1.null());
161163
Ok(())

gix-status/tests/status/index_as_worktree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ fn refresh() {
836836
index
837837
.entries_mut_keep_tree_cache()
838838
.iter_mut()
839-
.for_each(|e| e.stat = Default::default())
839+
.for_each(|e| e.stat = Default::default());
840840
},
841841
#[cfg(not(windows))]
842842
&[

0 commit comments

Comments
 (0)