From 7b860affbeb015aa0298a95b1e23eb8db7d181cc Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Sat, 24 Sep 2016 19:18:48 -0400
Subject: [PATCH] Change the default output of --files to elide './'.

This is kind of a ticky-tack change. I do think ./ as a prefix is
reasonable default, *but* we strip ./ when showing search results, so it
does make sense to be consistent.

Fixes #21.
---
 src/printer.rs | 4 +++-
 tests/tests.rs | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/printer.rs b/src/printer.rs
index 9a0dd1e4..999e078a 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<W: Terminal + Send> Printer<W> {
 
     /// Prints the given path.
     pub fn path<P: AsRef<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 5b86a40b..bd85fb19 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");
     }
 }