From c85bbe7fe470e6bf2735296bb94ff71287dd06ea Mon Sep 17 00:00:00 2001 From: Nguyen Duc Toan Date: Sat, 30 Sep 2023 13:49:50 +0700 Subject: [PATCH] fix linux build break --- app/src/manager/folder.rs | 4 ++-- core/src/manager/finder.rs | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/manager/folder.rs b/app/src/manager/folder.rs index a19ce9d4..f0552bad 100644 --- a/app/src/manager/folder.rs +++ b/app/src/manager/folder.rs @@ -72,9 +72,9 @@ impl<'a> Folder<'a> { let v = self.is_find.then_some(()).and_then(|_| { let finder = self.cx.manager.active().finder()?; #[cfg(target_os = "windows")] - let (head, body, tail) = finder.explode(&short.name.to_string_lossy())?; + let (head, body, tail) = finder.explode(short.name.to_string_lossy().as_bytes())?; #[cfg(not(target_os = "windows"))] - let (head, body, tail) = finder.explode(&short.name)?; + let (head, body, tail) = finder.explode(short.name.as_bytes())?; // TODO: to be configured by THEME? let style = Style::new().fg(Color::Rgb(255, 255, 50)).add_modifier(Modifier::ITALIC); diff --git a/core/src/manager/finder.rs b/core/src/manager/finder.rs index 4659187c..c5a72f99 100644 --- a/core/src/manager/finder.rs +++ b/core/src/manager/finder.rs @@ -111,13 +111,12 @@ impl Finder { /// Explode the name into three parts: head, body, tail. #[inline] - pub fn explode<'a>(&self, name: &'a impl AsRef) -> Option<(String, String, String)> { - let b = name.as_ref().as_bytes(); - let range = self.query.find(b).map(|m| m.range())?; + pub fn explode<'a>(&self, name: &[u8]) -> Option<(String, String, String)> { + let range = self.query.find(name).map(|m| m.range())?; Some(( - String::from_utf8_lossy(&b[..range.start]).to_string(), - String::from_utf8_lossy(&b[range.start..range.end]).to_string(), - String::from_utf8_lossy(&b[range.end..]).to_string(), + String::from_utf8_lossy(&name[..range.start]).to_string(), + String::from_utf8_lossy(&name[range.start..range.end]).to_string(), + String::from_utf8_lossy(&name[range.end..]).to_string(), )) } }