Merge branch 'master' into winget

.github/workflows/CICD.yml

@@ -6,7 +6,7 @@ env:
   PROJECT_NAME: lsd
   PROJECT_DESC: "An ls command with a lot of pretty colors."
   PROJECT_AUTH: "Peltoche <[email protected]>"
-  RUST_MIN_SRV: "1.64.0"
+  RUST_MIN_SRV: "1.69.0"
 
 on: [push, pull_request]
 

Cargo.toml

@@ -33,7 +33,7 @@ once_cell = "1.17.1"
 chrono = { version = "0.4.*", features = ["unstable-locales"] }
 chrono-humanize = "0.1.*"
 unicode-width = "0.1.*"
-lscolors = "0.14.0"
+lscolors = "0.15.0"
 wild = "2.0.*"
 globset = "0.4.*"
 xdg = "2.1.*"

README.md

@@ -1,3 +1,26 @@
+<div align="center">
+
+<p>
+  <sup>
+    <a href="https://github.com/sponsors/zwpaper">LSD is supported by the community.</a>
+  </sup>
+</p>
+<sup>Special thanks to:</sup>
+<br>
+<br>
+<a href="https://www.warp.dev/?utm_source=github&utm_medium=referral&utm_campaign=lsd_20231001">
+  <div>
+    <img src="https://user-images.githubusercontent.com/3764335/271887540-b782d11d-d122-484d-8cd3-7fdff3b4ac4d.png" width="230" alt="Warp">
+  </div>
+  <b>Warp is a blazingly fast, Rust-based terminal reimagined to work like a modern app.</b>
+  <div>
+    <sup>Get more done in the CLI with real text editing, block-based output, and AI command search.</sup>
+  </div>
+</a>
+<hr>
+</div>
+
+
 # LSD (LSDeluxe)
 
 [![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](https://raw.githubusercontent.com/lsd-rs/lsd/master/LICENSE)

build.rs

@@ -16,8 +16,8 @@ include!("src/app.rs");
 
 fn main() {
     // rustc version too small or can't figure it out
-    if version_check::is_min_version("1.64.0") != Some(true) {
-        eprintln!("'lsd' requires rustc >= 1.64.0");
+    if version_check::is_min_version("1.69.0") != Some(true) {
+        eprintln!("'lsd' requires rustc >= 1.69.0");
         exit(1);
     }
 

src/flags/literal.rs

@@ -14,26 +14,22 @@ impl Configurable<Self> for Literal {
     /// Get a potential `Literal` value from [Cli].
     ///
     /// If the "literal" argument is passed, this returns a `Literal` with value `true` in a
-    /// [Some]. Otherwise this returns `Literal` with value `false` in a [Some].
+    /// [Some]. Otherwise this returns [None].
     fn from_cli(cli: &Cli) -> Option<Self> {
         if cli.literal {
             Some(Self(true))
         } else {
-            Some(Self(false))
+            None
         }
     }
 
     /// Get a potential `Literal` value from a [Config].
     ///
     /// If the `Config::indicators` has value,
     /// this returns its value as the value of the `Literal`, in a [Some].
-    /// Otherwise this returns `Literal` with value `false` in a [Some].
+    /// Otherwise this returns [None].
     fn from_config(config: &Config) -> Option<Self> {
-        if let Some(value) = config.literal {
-            Some(Self(value))
-        } else {
-            Some(Self(false))
-        }
+        config.literal.map(Self)
     }
 }
 
@@ -51,7 +47,7 @@ mod test {
     fn test_from_cli_none() {
         let argv = ["lsd"];
         let cli = Cli::try_parse_from(argv).unwrap();
-        assert_eq!(Some(Literal(false)), Literal::from_cli(&cli));
+        assert_eq!(None, Literal::from_cli(&cli));
     }
 
     #[test]
@@ -63,10 +59,7 @@ mod test {
 
     #[test]
     fn test_from_config_none() {
-        assert_eq!(
-            Some(Literal(false)),
-            Literal::from_config(&Config::with_none())
-        );
+        assert_eq!(None, Literal::from_config(&Config::with_none()));
     }
 
     #[test]

src/meta/mod.rs

@@ -386,7 +386,7 @@ mod tests {
         // likely to fail because of permission issue
         // see https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html
         #[cfg(windows)]
-        std::os::windows::fs::symlink_file(&path_c, &path_b)
+        std::os::windows::fs::symlink_file(path_c, &path_b)
             .expect("failed to create broken symlink");
 
         let meta_b = Meta::from_path(&path_b, true, false).expect("failed to get meta");

src/sort.rs

@@ -378,7 +378,7 @@ mod tests {
         // likely to fail because of permission issue
         // see https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html
         #[cfg(windows)]
-        std::os::windows::fs::symlink_file(&path_d, &path_c)
+        std::os::windows::fs::symlink_file(path_d, &path_c)
             .expect("failed to create broken symlink");
 
         let meta_c = Meta::from_path(&path_c, true, false).expect("failed to get meta");

src/theme/color.rs

@@ -78,7 +78,7 @@ where
 }
 
 /// A struct holding the theme configuration
-/// Color table: https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.avg
+/// Color table: https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg
 #[derive(Debug, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 #[serde(deny_unknown_fields)]