From e8d7716df37dc21ebe1aae152ffed8a85040881c Mon Sep 17 00:00:00 2001 From: sxyazi Date: Tue, 19 Sep 2023 00:24:01 +0800 Subject: [PATCH] .. --- core/Cargo.toml | 6 ++---- core/src/tasks/workers/file.rs | 21 +++++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index ed6ce21f..6b459940 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -26,13 +26,11 @@ syntect = "^5" tokio = { version = "^1", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs", "process", "io-std", "io-util" ] } tokio-stream = "^0" tracing = "^0" -trash = { version = "^3", optional = true } unicode-width = "^0" yazi-prebuild = "^0" [target.'cfg(target_os = "windows")'.dependencies] clipboard-win = "^4" -[features] -trash_bin = [ "trash" ] -default = [ "trash_bin" ] +[target.'cfg(not(target_os = "netbsd"))'.dependencies] +trash = "^3" diff --git a/core/src/tasks/workers/file.rs b/core/src/tasks/workers/file.rs index a7d9ea07..52d8f77d 100644 --- a/core/src/tasks/workers/file.rs +++ b/core/src/tasks/workers/file.rs @@ -152,19 +152,16 @@ impl File { self.sch.send(TaskOp::Adv(task.id, 1, task.length))? } FileOp::Trash(task) => { - #[cfg(feature = "trash_bin")] + #[cfg(target_os = "macos")] { - #[cfg(target_os = "macos")] - { - use trash::{macos::{DeleteMethod, TrashContextExtMacos}, TrashContext}; - let mut ctx = TrashContext::default(); - ctx.set_delete_method(DeleteMethod::NsFileManager); - ctx.delete(&task.target)?; - } - #[cfg(not(target_os = "macos"))] - { - trash::delete(&task.target)?; - } + use trash::{macos::{DeleteMethod, TrashContextExtMacos}, TrashContext}; + let mut ctx = TrashContext::default(); + ctx.set_delete_method(DeleteMethod::NsFileManager); + ctx.delete(&task.target)?; + } + #[cfg(not(target_os = "netbsd"))] + { + trash::delete(&task.target)?; } self.sch.send(TaskOp::Adv(task.id, 1, task.length))?; }