Improve error reporting

ClementNerma · Dec 19, 2023 · d3ca400 · d3ca400
1 parent fe670fd
commit d3ca400
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trasher"
-version = "3.1.6"
+version = "3.1.7"
 authors = ["Clément Nerma <clement.nerma@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/src/fsutils.rs b/src/fsutils.rs
@@ -113,9 +113,9 @@ pub fn list_trash_items(trash_dir: &Path) -> Result<Vec<TrashedItem>> {
         .into_iter()
         .filter_map(|item| {
             match item.file_name().into_string() {
-                Err(invalid_filename) => eprintln!(
+                Err(_) => eprintln!(
                     "WARN: Trash item '{}' does not have a valid UTF-8 filename!",
-                    invalid_filename.to_string_lossy()
+                    item.path().display()
                 ),
 
                 Ok(filename) => {
@@ -127,8 +127,9 @@ pub fn list_trash_items(trash_dir: &Path) -> Result<Vec<TrashedItem>> {
                         Err(err) => {
                             eprintln!(
                                 "WARN: Trash item '{}' does not have a valid trash filename!",
-                                filename
+                                item.path().display()
                             );
+
                             super::debug!("Invalid trash item filename: {:?}", err);
                         }