adapt to changes in gix-dir

Author: Byron

gitoxide-core/src/repository/clean.rs

@@ -163,7 +163,7 @@ pub(crate) mod function {
                     .join(gix::path::from_bstr(entry.rela_path.as_bstr()))
                     .metadata()
                     .ok()
-                    .and_then(|e| gix::dir::entry::Kind::try_from_file_type(e.file_type()));
+                    .map(|e| e.file_type().into());
             }
             let mut disk_kind = entry.disk_kind.expect("present if not pruned");
             if !keep {
@@ -183,6 +183,7 @@ pub(crate) mod function {
             }
 
             match disk_kind {
+                Kind::NonFile => unreachable!("these are always considered pruned, and they were skipped earlier."),
                 Kind::File | Kind::Symlink => {}
                 Kind::Directory => {
                     if !directories {
@@ -254,6 +255,7 @@ pub(crate) mod function {
                     "WOULD remove"
                 },
                 suffix = match disk_kind {
+                    Kind::NonFile => unreachable!("these are always considered pruned, and they were skipped earlier."),
                     Kind::Directory if entry.property == Some(gix::dir::entry::Property::EmptyDirectory) => {
                         " empty"
                     }

gix-status/src/index_as_worktree_with_renames/mod.rs

@@ -466,6 +466,7 @@ pub(super) mod function {
                     ModificationOrDirwalkEntry::Modification(c) => c.entry.mode.to_tree_entry_mode(),
                     ModificationOrDirwalkEntry::DirwalkEntry { entry, .. } => entry.disk_kind.map(|kind| {
                         match kind {
+                            Kind::NonFile => unreachable!("we rejected non-file entries earlier"),
                             Kind::File => gix_object::tree::EntryKind::Blob,
                             Kind::Symlink => gix_object::tree::EntryKind::Link,
                             Kind::Repository | Kind::Directory => gix_object::tree::EntryKind::Tree,
@@ -495,11 +496,12 @@ pub(super) mod function {
             buf: &mut Vec<u8>,
             should_interrupt: &std::sync::atomic::AtomicBool,
         ) -> Result<gix_hash::ObjectId, Error> {
-            let Some(kind) = disk_kind else {
+            let Some(kind) = disk_kind.filter(|kind| !matches!(kind, Kind::NonFile)) else {
                 return Ok(object_hash.null());
             };
 
             Ok(match kind {
+                Kind::NonFile => unreachable!("rejected earlier"),
                 Kind::File => {
                     let platform = attrs
                         .at_entry(rela_path, None, objects)