Skip to content

Commit

Permalink
Reword "non-files" in documentation comments
Browse files Browse the repository at this point in the history
This goes along with changing `NonFile` to `Untrackable`.
  • Loading branch information
EliahKagan authored Dec 22, 2024
1 parent 329a734 commit 154b21f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gitoxide-core/src/repository/clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ pub(crate) mod function {
match disk_kind {
Kind::Untrackable => {
if debug {
writeln!(err, "DBG: skipped non-file at '{}'", entry.rela_path).ok();
writeln!(err, "DBG: skipped untrackable entry at '{}'", entry.rela_path).ok();
}
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions gix-dir/tests/dir/walk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn one_top_level_fifo() {
assert_eq!(
entries,
&[entry("top", Untracked, Untrackable),],
"Non-files are like normal files, but with a different state"
"Untrackable entries are like normal files, but with a different state"
);
}

Expand Down Expand Up @@ -107,7 +107,7 @@ fn fifo_in_traversal() {
entry("file", Untracked, File),
entry("top", Untracked, Untrackable),
],
"Non-files only differ by their disk-kind"
"Untrackable entries only differ by their disk-kind"
);
}

Expand Down
2 changes: 1 addition & 1 deletion gix-status/src/index_as_worktree_with_renames/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ pub(super) mod function {

impl<T, U> gix_dir::walk::Delegate for Delegate<'_, '_, T, U> {
fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option<Status>) -> Action {
// Status never shows untracked non-files
// Status never shows untracked entries of untrackable type
if entry.disk_kind != Some(gix_dir::entry::Kind::Untrackable) {
let entry = entry.to_owned();
self.tx.send(Event::DirEntry(entry, collapsed_directory_status)).ok();
Expand Down

0 comments on commit 154b21f

Please sign in to comment.