Merge remote-tracking branch 'origin/master' into yyogo/master

Author: sharkdp

CHANGELOG.md

@@ -5,16 +5,20 @@
 
 ## Features
 
+- Support multiple `--exec <cmd>` instances, see #406 and 
+#960 (@tmccombs)
 
 ## Bugfixes
 
 
 ## Changes
 
-- Directories are now printed with an additional path separator at the end: `foo/bar/`
+- Changed `-u` flag to be equivalent to `-HI`. Multiple `-u` flags still allowed but do nothing, see #840 (@jacksontheel)
+- Directories are now printed with an additional path separator at the end: `foo/bar/`, see #436 and #812 (@yyogo)
 
 ## Other
 
+- Added installation instructions for RHEL8, see #989 (@ethsol)
 
 # v8.3.2
 

Cargo.lock

@@ -39,7 +39,7 @@ ansi_term = "0.12"
 atty = "0.2"
 ignore = "0.4.3"
 num_cpus = "1.13"
-regex = "1.5.4"
+regex = "1.5.5"
 regex-syntax = "0.6"
 ctrlc = "3.2"
 humantime = "2.1"
@@ -49,15 +49,15 @@ anyhow = "1.0"
 dirs-next = "2.0"
 normpath = "0.3.2"
 chrono = "0.4"
-once_cell = "1.9.0"
+once_cell = "1.10.0"
 
 [dependencies.clap]
 version = "3.1"
 features = ["suggestions", "color", "wrap_help", "cargo", "unstable-grouped"]
 
 [target.'cfg(unix)'.dependencies]
 users = "0.11.0"
-nix = "0.23.1"
+nix = "0.24.1"
 
 [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
 libc = "0.2"

Cargo.toml

@@ -592,6 +592,22 @@ You can install `fd` via xbps-install:
 xbps-install -S fd
 ```
 
+### On RedHat Enterprise Linux 8 (RHEL8) or Almalinux 8 or Rocky Linux 8
+
+Get the latest fd-v*-x86_64-unknown-linux-gnu.tar.gz file from [sharkdp on github](https://github.com/sharkdp/fd/releases)
+```
+tar xf fd-v*-x86_64-unknown-linux-gnu.tar.gz
+chown -R root:root fd-v*-x86_64-unknown-linux-gnu
+cd fd-v*-x86_64-unknown-linux-gnu
+sudo cp fd /bin
+gzip fd.1
+chown root:root fd.1.gz
+sudo cp fd.1.gz /usr/share/man/man1
+sudo cp autocomplete/fd.bash /usr/share/bash-completion/completions/fd
+source /usr/share/bash-completion/completions/fd
+fd 
+```
+
 ### On macOS
 
 You can install `fd` with [Homebrew](https://formulae.brew.sh/formula/fd):
@@ -618,6 +634,13 @@ Or via [Chocolatey](https://chocolatey.org):
 choco install fd
 ```
 
+### On GuixOS
+
+You can install [the fd package](https://guix.gnu.org/en/packages/fd-8.1.1/) from the official repo:
+```
+guix install fd
+```
+
 ### On NixOS / via Nix
 
 You can use the [Nix package manager](https://nixos.org/nix/) to install `fd`:

README.md

@@ -58,7 +58,7 @@ The global fd ignore file (usually
 The flag can be overridden with '--ignore'.
 .TP
 .B \-u, \-\-unrestricted
-Alias for '--no-ignore'. Can be repeated; '-uu' is an alias for '--no-ignore --hidden'.
+Perform an unrestricted search, including ignored and hidden files. This is an alias for '--hidden --no-ignore'.
 .TP
 .B \-\-no\-ignore\-vcs
 Show search results from files and directories that would otherwise be ignored by gitignore files

doc/fd.1

@@ -102,12 +102,12 @@ pub fn build_app() -> Command<'static> {
                 .short('u')
                 .long("unrestricted")
                 .overrides_with_all(&["ignore", "no-hidden"])
-                .multiple_occurrences(true)
+                .multiple_occurrences(true) // Allowed for historical reasons
                 .hide_short_help(true)
-                .help("Alias for '--no-ignore', and '--hidden' when given twice")
+                .help("Unrestricted search, alias for '--no-ignore --hidden'")
                 .long_help(
-                    "Alias for '--no-ignore'. Can be repeated. '-uu' is an alias for \
-                         '--no-ignore --hidden'.",
+                    "Perform an unrestricted search, including ignored and hidden files. This is \
+                    an alias for '--no-ignore --hidden'."
                 ),
         )
         .arg(

src/app.rs

@@ -260,7 +260,7 @@ fn construct_config(matches: clap::ArgMatches, pattern_regex: &str) -> Result<Co
         case_sensitive,
         search_full_path: matches.is_present("full-path"),
         ignore_hidden: !(matches.is_present("hidden")
-            || matches.occurrences_of("rg-alias-hidden-ignore") >= 2),
+            || matches.is_present("rg-alias-hidden-ignore")),
         read_fdignore: !(matches.is_present("no-ignore")
             || matches.is_present("rg-alias-hidden-ignore")),
         read_vcsignore: !(matches.is_present("no-ignore")

src/main.rs

@@ -15,19 +15,19 @@ pub fn pattern_has_uppercase_char(pattern: &str) -> bool {
 fn hir_has_uppercase_char(hir: &Hir) -> bool {
     use regex_syntax::hir::*;
 
-    match *hir.kind() {
+    match hir.kind() {
         HirKind::Literal(Literal::Unicode(c)) => c.is_uppercase(),
-        HirKind::Literal(Literal::Byte(b)) => char::from(b).is_uppercase(),
-        HirKind::Class(Class::Unicode(ref ranges)) => ranges
+        HirKind::Literal(Literal::Byte(b)) => char::from(*b).is_uppercase(),
+        HirKind::Class(Class::Unicode(ranges)) => ranges
             .iter()
             .any(|r| r.start().is_uppercase() || r.end().is_uppercase()),
-        HirKind::Class(Class::Bytes(ref ranges)) => ranges
+        HirKind::Class(Class::Bytes(ranges)) => ranges
             .iter()
             .any(|r| char::from(r.start()).is_uppercase() || char::from(r.end()).is_uppercase()),
-        HirKind::Group(Group { ref hir, .. }) | HirKind::Repetition(Repetition { ref hir, .. }) => {
+        HirKind::Group(Group { hir, .. }) | HirKind::Repetition(Repetition { hir, .. }) => {
             hir_has_uppercase_char(hir)
         }
-        HirKind::Concat(ref hirs) | HirKind::Alternation(ref hirs) => {
+        HirKind::Concat(hirs) | HirKind::Alternation(hirs) => {
             hirs.iter().any(hir_has_uppercase_char)
         }
         _ => false,
@@ -52,19 +52,19 @@ fn hir_matches_strings_with_leading_dot(hir: &Hir) -> bool {
     // "^\\.", i.e. a start text anchor and a literal dot character. There are a lot
     // of other patterns that ONLY match hidden files, e.g. ^(\\.foo|\\.bar) which are
     // not (yet) detected by this algorithm.
-    match *hir.kind() {
-        HirKind::Concat(ref hirs) => {
+    match hir.kind() {
+        HirKind::Concat(hirs) => {
             let mut hirs = hirs.iter();
             if let Some(hir) = hirs.next() {
-                if *hir.kind() != HirKind::Anchor(Anchor::StartText) {
+                if hir.kind() != &HirKind::Anchor(Anchor::StartText) {
                     return false;
                 }
             } else {
                 return false;
             }
 
             if let Some(hir) = hirs.next() {
-                *hir.kind() == HirKind::Literal(Literal::Unicode('.'))
+                hir.kind() == &HirKind::Literal(Literal::Unicode('.'))
             } else {
                 false
             }

src/regex_helper.rs

@@ -656,18 +656,6 @@ fn test_no_ignore_aliases() {
 
     te.assert_output(
         &["-u", "foo"],
-        "./a.foo
-        ./fdignored.foo
-        ./gitignored.foo
-        ./one/b.foo
-        ./one/two/c.foo
-        ./one/two/C.Foo2
-        ./one/two/three/d.foo
-        ./one/two/three/directory_foo/",
-    );
-
-    te.assert_output(
-        &["-uu", "foo"],
         "./.hidden.foo
         ./a.foo
         ./fdignored.foo
@@ -2039,7 +2027,7 @@ fn test_number_parsing_errors() {
 #[test_case("--no-ignore-vcs", &["--ignore-vcs"] ; "no-ignore-vcs")]
 #[test_case("--follow", &["--no-follow"] ; "follow")]
 #[test_case("--absolute-path", &["--relative-path"] ; "absolute-path")]
-#[test_case("-u", &["--ignore"] ; "u")]
+#[test_case("-u", &["--ignore", "--no-hidden"] ; "u")]
 #[test_case("-uu", &["--ignore", "--no-hidden"] ; "uu")]
 fn test_opposing(flag: &str, opposing_flags: &[&str]) {
     let te = TestEnv::new(DEFAULT_DIRS, DEFAULT_FILES);