Merge branch 'main' into v1.0-development

CHANGELOG.md

@@ -1,12 +1,32 @@
 # Changelog
 
+## [0.17.3] - 2024-01-25
+
+### Bug Fixes
+
+- Remove version testing
+
+### Miscellaneous Tasks
+
+- Avoid `unwrap()` by changing filter-then-map to `filter_map`
+
+### Build
+
+- Bump shlex from 1.2.0 to 1.3.0
+- Bump chrono from 0.4.31 to 0.4.33
+- Bump trycmd from 0.14.19 to 0.14.20
+
 ## [0.17.2] - 2024-01-20
 
 ### Bug Fixes
 
 - Crash using --git-repos on unreadable dir
 - Crash using --git-repos on unreadable dir
 
+### Miscellaneous Tasks
+
+- Release eza v0.17.2
+
 ### Build
 
 - Add cargo-bump for releasing
@@ -1232,7 +1252,6 @@
 
 ### Documentation
 
-- Add hint how to install exa on Android / Termux
 - Change name in README.md
 - Add `nix run` to readme
 - Fix flow issue
@@ -1253,14 +1272,8 @@
 - Update README.md
 - Update README.md
 
-### Feat
-
-- Add JPF to image filetype
-
 ### Features
 
-- Add support Typescript and ReasonML projects
-- New Icons and CLI argument to suppress icons
 - Add sty file
 - Add julia file extension icon
 - Add status for git repos
@@ -1284,37 +1297,21 @@
 - Add compressed types
 - Add compressed icons
 
-### Fixup
-
-- Split prefix tests by property
-
 ### Improve
 
 - Vim icon
 
-### Makefile
-
-- Be compatible with BSD and OS X
-
 ### Miscellaneous Tasks
 
-- Update zoneinfo_compiled, datetime to 0.5
-- Update users to 0.10
-- PR feedback
 - Bump to v0.10.2
 - Bump to v0.10.3
 - Update cargo lock
 
 ### Refactor
 
-- Use shorthand fields
 - Removed commented code
 - Sorted file types, color table
 
-### StatResult
-
-- :Path -> Dir
-
 ### Styling
 
 - Add icon for reStructuredText (src) files
@@ -1323,18 +1320,10 @@
 
 - Change to /usr/bin/env bash
 
-### ToStr
-
-- :to_str -> ToString::to_string
-
 ### Add
 
 - Mp2 audio format icon
 
-### Build
-
-- Use binary name only
-
 ### Ci
 
 - Remove unused .github files
@@ -1355,33 +1344,92 @@
 - Add snap to labeler.yml
 - Add filetype.rs autolabel
 
-### Details
-
-- `filter` is only used when recursing
-
 ### Git
 
 - Use GIT_DIR env var to find the repo
 - Use open_from_env before discover
 
+### Icons
+
+- Add Gentoo for .ebuild
+
+### Src/main.rs
+
+- Remove clippy::unnested_or_patterns
+
+## [0.10.0] - 2021-04-03
+
+### Documentation
+
+- Add hint how to install exa on Android / Termux
+
+### Features
+
+- Add support Typescript and ReasonML projects
+- New Icons and CLI argument to suppress icons
+
+### Miscellaneous Tasks
+
+- Update zoneinfo_compiled, datetime to 0.5
+- Update users to 0.10
+- PR feedback
+
+### Build
+
+- Use binary name only
+
 ### Git-feature
 
 - Display if a file is updated but unmerged (conflicted)
 
-### Icons
+## [0.9.0] - 2019-07-15
 
-- Add Gentoo for .ebuild
+### Feat
 
-### Io
+- Add JPF to image filetype
 
-- :Result -> IOResult
+### Refactor
 
-### Src/main.rs
+- Use shorthand fields
 
-- Remove clippy::unnested_or_patterns
+## [0.8.0] - 2017-09-30
 
 ### Vagrant
 
 - Update apt before installing
 
+## [0.4.1] - 2017-03-26
+
+### Fixup
+
+- Split prefix tests by property
+
+### Io
+
+- :Result -> IOResult
+
+## [0.4.0] - 2015-10-18
+
+### Makefile
+
+- Be compatible with BSD and OS X
+
+## [0.3.0] - 2015-06-05
+
+### StatResult
+
+- :Path -> Dir
+
+## [0.2.0] - 2015-03-02
+
+### Details
+
+- `filter` is only used when recursing
+
+## [0.1.0] - 2015-02-21
+
+### ToStr
+
+- :to_str -> ToString::to_string
+
 

Cargo.toml

@@ -16,7 +16,7 @@ readme = "README.md"
 homepage = "https://github.com/eza-community/eza"
 license = "MIT"
 repository = "https://github.com/eza-community/eza"
-version = "0.17.2"
+version = "0.17.3"
 
 
 [package.metadata.deb]
@@ -72,7 +72,7 @@ name = "eza"
 
 [dependencies]
 ansiterm = { version = "0.12.2", features = ["ansi_colours"] }
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.33", default-features = false, features = ["clock"] }
 glob = "0.3"
 libc = "0.2"
 locale = "0.2"
@@ -111,7 +111,7 @@ windows-sys = { version = "0.52.0", features = [
 ] }
 
 [build-dependencies]
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.33", default-features = false, features = ["clock"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }

src/main.rs

@@ -190,8 +190,7 @@ fn get_files_in_dir(paths: &mut Vec<PathBuf>, path: PathBuf) {
                 vec![path]
             }
             Ok(d) => d
-                .filter(std::result::Result::is_ok)
-                .map(|entry| entry.unwrap().path())
+                .filter_map(|entry| entry.ok().map(|e| e.path()))
                 .collect::<Vec<PathBuf>>(),
         }
     } else {