Merge branch 'lsd-rs:master' into master

zwpaper · Nov 16, 2024 · 3d1a2ba · 3d1a2ba
2 parents 92e3252 + a0bbb20
commit 3d1a2ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app.rs b/src/app.rs
@@ -65,7 +65,7 @@ pub struct Cli {
     pub depth: Option<usize>,
 
     /// Display directories themselves, and not their contents (recursively when used with --tree)
-    #[arg(short, long, conflicts_with_all = ["depth", "recursive"])]
+    #[arg(short, long, conflicts_with = "recursive")]
     pub directory_only: bool,
 
     /// How to display permissions [default: rwx for linux, attributes for windows]

diff --git a/src/theme/icon.rs b/src/theme/icon.rs
@@ -731,6 +731,7 @@ impl IconTheme {
             ("yml", "\u{e60b}"),             // ""
             ("zip", "\u{f410}"),             // ""
             ("zig", "\u{e6a9}"),             // ""
+            ("zon", "\u{e60b}"),             // ""
             ("zshrc", "\u{f489}"),           // ""
             ("zsh-theme", "\u{f489}"),       // ""
             ("zsh", "\u{f489}"),             // ""