diff --git a/src/printer.rs b/src/printer.rs index 9a0dd1e42..999e078a9 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -4,6 +4,7 @@ use regex::bytes::Regex; use term::{Attr, Terminal}; use term::color; +use pathutil::strip_prefix; use types::FileTypeDef; /// Printer encapsulates all output logic for searching. @@ -138,7 +139,8 @@ impl Printer { /// Prints the given path. pub fn path>(&mut self, path: P) { - self.write(path.as_ref().to_string_lossy().as_bytes()); + let path = strip_prefix("./", path.as_ref()).unwrap_or(path.as_ref()); + self.write(path.to_string_lossy().as_bytes()); self.write_eol(); } diff --git a/tests/tests.rs b/tests/tests.rs index 5b86a40b9..bd85fb19e 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -703,11 +703,9 @@ fn files() { cmd.arg("--files"); let lines: String = wd.stdout(&mut cmd); if cfg!(windows) { - assert!(lines == "./dir\\file\n./file\n" - || lines == "./file\n./dir\\file\n"); + assert!(lines == "dir\\file\nfile\n" || lines == "file\ndir\\file\n"); } else { - assert!(lines == "./file\n./dir/file\n" - || lines == "./dir/file\n./file\n"); + assert!(lines == "file\ndir/file\n" || lines == "dir/file\nfile\n"); } }