From 55c6aad3a7ce15a561ecbf9cfdee64b6c7c87688 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Wed, 27 Mar 2024 23:51:54 +0800 Subject: [PATCH] .. --- yazi-adaptor/src/image.rs | 2 +- yazi-core/src/tab/tab.rs | 4 ++-- yazi-fm/src/logs.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yazi-adaptor/src/image.rs b/yazi-adaptor/src/image.rs index 3fbb3b9f..8db29c18 100644 --- a/yazi-adaptor/src/image.rs +++ b/yazi-adaptor/src/image.rs @@ -39,7 +39,7 @@ impl Image { img.as_bytes(), img.width(), img.height(), - img.color().into(), + img.color(), )?; Ok::<_, anyhow::Error>(buf) }) diff --git a/yazi-core/src/tab/tab.rs b/yazi-core/src/tab/tab.rs index f8ccf62e..93339a87 100644 --- a/yazi-core/src/tab/tab.rs +++ b/yazi-core/src/tab/tab.rs @@ -62,7 +62,7 @@ impl Tab { if self.selected.is_empty() { self.current.hovered().map(|h| vec![&h.url]).unwrap_or_default() } else { - self.selected.iter().collect() + self.selected.keys().collect() } } @@ -74,7 +74,7 @@ impl Tab { if self.selected.is_empty() { vec![&h.url, &h.url] } else { - [&h.url].into_iter().chain(self.selected.iter()).collect() + [&h.url].into_iter().chain(self.selected.keys()).collect() } } diff --git a/yazi-fm/src/logs.rs b/yazi-fm/src/logs.rs index 6161dda2..3e2ceca8 100644 --- a/yazi-fm/src/logs.rs +++ b/yazi-fm/src/logs.rs @@ -15,8 +15,8 @@ impl Logs { let (handle, guard) = tracing_appender::non_blocking(appender); // let filter = EnvFilter::from_default_env(); - let subscriber = - Registry::default().with(fmt::layer().pretty().with_writer(handle).with_ansi(false)); + let subscriber = Registry::default() + .with(fmt::layer().pretty().with_writer(handle).with_ansi(cfg!(debug_assertions))); tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");