From e8645dc8aee910c9ce4b181afeb4ab9ad016670b Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Mon, 10 Oct 2016 19:27:12 -0400
Subject: style nits

---
 src/args.rs    |  4 ++--
 tests/tests.rs | 39 ++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/args.rs b/src/args.rs
index 365749d8..6ee30e7f 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -709,8 +709,8 @@ impl Args {
     /// Create a new recursive directory iterator at the path given.
     pub fn walker(&self, path: &Path) -> Result<walk::Iter> {
         // Always follow symlinks for explicitly specified files.
-        let mut wd = WalkDir::new(path).follow_links(self.follow
-                                                     || path.is_file());
+        let mut wd = WalkDir::new(path).follow_links(
+            self.follow || path.is_file());
         if let Some(maxdepth) = self.maxdepth {
             wd = wd.max_depth(maxdepth);
         }
diff --git a/tests/tests.rs b/tests/tests.rs
index bf4d3570..965d37a3 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -567,25 +567,6 @@ baz/sherlock:be, to a very large extent, the result of luck. Sherlock Holmes
     assert_eq!(lines, path(expected));
 });
 
-// Follow symlinks on explicit file arguments.
-sherlock!(symlink_explicit_file, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
-    wd.link("sherlock", "sym1");
-    wd.link("sherlock", "sym2");
-    cmd.arg("sym1");
-    cmd.arg("sym2");
-
-    let lines: String = wd.stdout(&mut cmd);
-    let expected = "\
-sherlock:For the Doctor Watsons of this world, as opposed to the Sherlock
-sherlock:be, to a very large extent, the result of luck. Sherlock Holmes
-sym1:For the Doctor Watsons of this world, as opposed to the Sherlock
-sym1:be, to a very large extent, the result of luck. Sherlock Holmes
-sym2:For the Doctor Watsons of this world, as opposed to the Sherlock
-sym2:be, to a very large extent, the result of luck. Sherlock Holmes
-";
-    assert_eq!(lines, path(expected));
-});
-
 sherlock!(unrestricted1, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
     wd.create(".gitignore", "sherlock\n");
     cmd.arg("-u");
@@ -801,6 +782,26 @@ clean!(regression_131, "test", ".", |wd: WorkDir, mut cmd: Command| {
     wd.assert_err(&mut cmd);
 });
 
+// See: https://github.com/BurntSushi/ripgrep/issues/137
+sherlock!(regression_137, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
+    wd.link("sherlock", "sym1");
+    wd.link("sherlock", "sym2");
+    cmd.arg("sym1");
+    cmd.arg("sym2");
+    cmd.arg("-j1");
+
+    let lines: String = wd.stdout(&mut cmd);
+    let expected = "\
+sherlock:For the Doctor Watsons of this world, as opposed to the Sherlock
+sherlock:be, to a very large extent, the result of luck. Sherlock Holmes
+sym1:For the Doctor Watsons of this world, as opposed to the Sherlock
+sym1:be, to a very large extent, the result of luck. Sherlock Holmes
+sym2:For the Doctor Watsons of this world, as opposed to the Sherlock
+sym2:be, to a very large extent, the result of luck. Sherlock Holmes
+";
+    assert_eq!(lines, path(expected));
+});
+
 // See: https://github.com/BurntSushi/ripgrep/issues/20
 sherlock!(feature_20_no_filename, "Sherlock", ".",
 |wd: WorkDir, mut cmd: Command| {
-- 
cgit v1.2.3