🎨 🔨 simplify the windows cfg

Signed-off-by: Wei Zhang <[email protected]>
lsd-rs · Feb 16, 2024 · b4d4462 · b4d4462
1 parent bc6c930
commit b4d4462
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/meta/mod.rs b/src/meta/mod.rs
@@ -12,8 +12,9 @@ mod permissions;
 mod permissions_or_attributes;
 mod size;
 mod symlink;
-mod windows_attributes;
 
+#[cfg(windows)]
+mod windows_attributes;
 #[cfg(windows)]
 mod windows_utils;
 

diff --git a/src/meta/name.rs b/src/meta/name.rs
@@ -205,9 +205,7 @@ impl Ord for Name {
 
 impl PartialOrd for Name {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.name
-            .to_lowercase()
-            .partial_cmp(&other.name.to_lowercase())
+        Some(self.cmp(other))
     }
 }
 

diff --git a/src/meta/windows_attributes.rs b/src/meta/windows_attributes.rs
@@ -1,12 +1,10 @@
-#[cfg(windows)]
 use crate::{
     color::{ColoredString, Colors, Elem},
     flags::Flags,
 };
-#[cfg(windows)]
+
 use std::os::windows::fs::MetadataExt;
 
-#[cfg(windows)]
 #[derive(Debug, Clone)]
 pub struct WindowsAttributes {
     pub archive: bool,
@@ -15,7 +13,6 @@ pub struct WindowsAttributes {
     pub system: bool,
 }
 
-#[cfg(windows)]
 pub fn get_attributes(metadata: &std::fs::Metadata) -> WindowsAttributes {
     use windows::Win32::Storage::FileSystem::{
         FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_READONLY,
@@ -34,7 +31,6 @@ pub fn get_attributes(metadata: &std::fs::Metadata) -> WindowsAttributes {
     }
 }
 
-#[cfg(windows)]
 impl WindowsAttributes {
     pub fn render(&self, colors: &Colors, _flags: &Flags) -> ColoredString {
         let res = [
@@ -64,7 +60,6 @@ impl WindowsAttributes {
     }
 }
 
-#[cfg(windows)]
 #[cfg(test)]
 mod test {
     use std::fs;