From 15e23f187ee66bd87c88d97bc62f5dcf41b23f45 Mon Sep 17 00:00:00 2001 From: Alexander Weiss Date: Sat, 11 Jan 2025 23:32:31 +0100 Subject: [PATCH] more windows fixes --- crates/core/src/backend/ignore.rs | 23 ++++++++++------------- crates/core/src/backend/node.rs | 1 - 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/crates/core/src/backend/ignore.rs b/crates/core/src/backend/ignore.rs index fa07f780..288e93b5 100644 --- a/crates/core/src/backend/ignore.rs +++ b/crates/core/src/backend/ignore.rs @@ -499,12 +499,11 @@ fn map_entry( Node::new_node(name, NodeType::Dir, meta) } else if m.is_symlink() { let path = entry.path(); - let target = read_link(path) - .map_err(|err| IgnoreErrorKind::ErrorLink { - path: path.to_path_buf(), - source: err, - })? - .as_encoded_bytes(); + let target = read_link(path).map_err(|err| IgnoreErrorKind::ErrorLink { + path: path.to_path_buf(), + source: err, + })?; + let target = target.as_os_str().as_encoded_bytes(); let node_type = NodeType::from_link(&target); Node::new_node(name, node_type, meta) } else { @@ -688,13 +687,11 @@ fn map_entry( Node::new_node(name, NodeType::Dir, meta) } else if m.is_symlink() { let path = entry.path(); - let target = read_link(path) - .map_err(|err| IgnoreErrorKind::ErrorLink { - path: path.to_path_buf(), - source: err, - })? - .into_os_string(); - let target = target.as_encoded_bytes(); + let target = read_link(path).map_err(|err| IgnoreErrorKind::ErrorLink { + path: path.to_path_buf(), + source: err, + })?; + let target = target.as_os_str().as_encoded_bytes(); let node_type = NodeType::from_link(&UnixPath::new(target).to_typed_path()); Node::new_node(name, node_type, meta) } else if filetype.is_block_device() { diff --git a/crates/core/src/backend/node.rs b/crates/core/src/backend/node.rs index 9632c455..33eb6700 100644 --- a/crates/core/src/backend/node.rs +++ b/crates/core/src/backend/node.rs @@ -1,7 +1,6 @@ use std::{borrow::Cow, cmp::Ordering, fmt::Debug}; use std::fmt::Write; -#[cfg(not(windows))] use std::num::ParseIntError; use chrono::{DateTime, Local};