Skip to content

Commit

Permalink
Merge pull request GitoxideLabs#1765 from EliahKagan/finalize-entry-next
Browse files Browse the repository at this point in the history
Avoid another "unused import" warning on Windows
  • Loading branch information
Byron authored Jan 13, 2025
2 parents af8f201 + c956d1b commit 8df5ba2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions gix-worktree-state/src/checkout/entry.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::{
borrow::Cow,
fs::{OpenOptions, Permissions},
io::Write,
path::{Path, PathBuf},
};
Expand Down Expand Up @@ -237,7 +236,7 @@ fn debug_assert_dest_is_no_symlink(path: &Path) {
}
}

fn open_options(path: &Path, destination_is_initially_empty: bool, overwrite_existing: bool) -> OpenOptions {
fn open_options(path: &Path, destination_is_initially_empty: bool, overwrite_existing: bool) -> std::fs::OpenOptions {
if overwrite_existing || !destination_is_initially_empty {
debug_assert_dest_is_no_symlink(path);
}
Expand Down Expand Up @@ -299,7 +298,7 @@ pub(crate) fn finalize_entry(
}

#[cfg(unix)]
fn set_mode_executable(mut perm: Permissions) -> Option<Permissions> {
fn set_mode_executable(mut perm: std::fs::Permissions) -> Option<std::fs::Permissions> {
use std::os::unix::fs::PermissionsExt;
let mut mode = perm.mode();
if mode & 0o170000 != 0o100000 {
Expand Down

0 comments on commit 8df5ba2

Please sign in to comment.