From 7d2740d6cd64a9e6bfc7d61749c1e9a336d5a9d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:03:35 +0000 Subject: [PATCH 01/21] Bump anyhow from 1.0.55 to 1.0.56 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.55 to 1.0.56. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.55...1.0.56) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8895415..e1d5df2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.55" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "atty" From 7ab29e17a32b2c5908bb6f072eb74c6c33fead67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:03:38 +0000 Subject: [PATCH 02/21] Bump once_cell from 1.9.0 to 1.10.0 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8895415..56c22cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,9 +410,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "os_str_bytes" diff --git a/Cargo.toml b/Cargo.toml index 6502428..7c866d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ 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" From 9dcfa4a6623bea0a891230ada6042a86c0b8544c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:03:43 +0000 Subject: [PATCH 03/21] Bump test-case from 2.0.0 to 2.0.2 Bumps [test-case](https://github.com/frondeus/test-case) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/frondeus/test-case/releases) - [Changelog](https://github.com/frondeus/test-case/blob/master/CHANGELOG.md) - [Commits](https://github.com/frondeus/test-case/compare/v2.0.0...v2.0.2) --- updated-dependencies: - dependency-name: test-case dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8895415..89fdcbd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -604,9 +604,9 @@ dependencies = [ [[package]] name = "test-case" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7d58e237f65d5fe5eaf1105188c94c9a441e1fbc298ed5df45ec9c9af236d3" +checksum = "6344589a99d3971d6fa4e8314dbcbeca2df6273a6b642e46906971779159af1f" dependencies = [ "cfg-if", "proc-macro-error", From cfa768755fdf5b484891cf54ed916dc37c9b61b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:03:48 +0000 Subject: [PATCH 04/21] Bump clap from 3.1.5 to 3.1.8 Bumps [clap](https://github.com/clap-rs/clap) from 3.1.5 to 3.1.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.1.5...v3.1.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8895415..df7e1f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.5" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312" +checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", "bitflags", From 803ea0a0b1dbe932b2b5ce3744a88feacca6786d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:03:53 +0000 Subject: [PATCH 05/21] Bump libc from 0.2.119 to 0.2.121 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.119 to 0.2.121. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.119...0.2.121) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8895415..999a031 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -320,9 +320,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.119" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "log" From 6faf9ff1e059150f70eebeefe9fefdbc2a97d60b Mon Sep 17 00:00:00 2001 From: ethsol Date: Thu, 31 Mar 2022 12:48:39 +0200 Subject: [PATCH 06/21] Added install instructions for RHEL8 and clones --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 8d28ce7..cc3798f 100644 --- a/README.md +++ b/README.md @@ -592,6 +592,21 @@ 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 +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): From 8a17ca25d627f9d2541faac8db94cb2c8f9524b0 Mon Sep 17 00:00:00 2001 From: ethsol Date: Thu, 31 Mar 2022 12:55:43 +0200 Subject: [PATCH 07/21] Added install instructions for RHEL8 and clones added chown for fd.1.gz, too --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cc3798f..870ef55 100644 --- a/README.md +++ b/README.md @@ -592,7 +592,7 @@ You can install `fd` via xbps-install: xbps-install -S fd ``` -### on RedHat Enterprise Linux 8 (RHEL8) or Almalinux 8 or Rocky Linux 8 +### 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) ``` @@ -601,6 +601,7 @@ 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 From 9d938075122565356f333fab1bf94b7b0b924cea Mon Sep 17 00:00:00 2001 From: ethsol Date: Thu, 31 Mar 2022 13:05:11 +0200 Subject: [PATCH 08/21] modification skeleton --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef3b18..99ca906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ ## Other - +- Added installation instructions for RHEL8, see #123 (@ethsol) # v8.3.2 From bbd8c78861dbe8be2c05b4b2596a50240a2f3a24 Mon Sep 17 00:00:00 2001 From: ethsol Date: Thu, 31 Mar 2022 13:13:42 +0200 Subject: [PATCH 09/21] Added installation instructions for RHEL8 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ca906..7bbee00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ ## Other -- Added installation instructions for RHEL8, see #123 (@ethsol) +- Added installation instructions for RHEL8, see #989 (@ethsol) # v8.3.2 From 3f6ff2ca32ae0a473ef7daa955895a29a23d9c7b Mon Sep 17 00:00:00 2001 From: Hang Qian Date: Sat, 19 Mar 2022 10:58:35 -0700 Subject: [PATCH 10/21] Match against reference instead of value --- src/regex_helper.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/regex_helper.rs b/src/regex_helper.rs index bc7f77a..877c927 100644 --- a/src/regex_helper.rs +++ b/src/regex_helper.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,11 +52,11 @@ 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 { @@ -64,7 +64,7 @@ fn hir_matches_strings_with_leading_dot(hir: &Hir) -> bool { } if let Some(hir) = hirs.next() { - *hir.kind() == HirKind::Literal(Literal::Unicode('.')) + hir.kind() == &HirKind::Literal(Literal::Unicode('.')) } else { false } From cf4964d0f80aa36e34d6c0c9a281960999ad5b58 Mon Sep 17 00:00:00 2001 From: Bost Date: Wed, 13 Apr 2022 13:56:32 +0200 Subject: [PATCH 11/21] Update README.md GuixOS installation instructions. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 870ef55..7267bfc 100644 --- a/README.md +++ b/README.md @@ -634,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`: From 4e828096243c872da5b34446fa095ad7865bc933 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 17:03:39 +0000 Subject: [PATCH 12/21] Bump clap_complete from 3.1.1 to 3.1.3 Bumps [clap_complete](https://github.com/clap-rs/clap) from 3.1.1 to 3.1.3. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v3.1.1...clap_complete-v3.1.3) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ede9a..6546807 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,15 +85,15 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.8" +version = "3.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" +checksum = "535434c063ced786eb04aaf529308092c5ab60889e8fe24275d15de07b01fa97" dependencies = [ "atty", "bitflags", + "clap_lex", "indexmap", "lazy_static", - "os_str_bytes", "strsim", "termcolor", "terminal_size", @@ -102,13 +102,22 @@ dependencies = [ [[package]] name = "clap_complete" -version = "3.1.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" +checksum = "1d7ca9141e27e6ebc52e3c378b0c07f3cea52db46ed1cc5861735fb697b56356" dependencies = [ "clap", ] +[[package]] +name = "clap_lex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "crossbeam-utils" version = "0.8.7" @@ -419,9 +428,6 @@ name = "os_str_bytes" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] [[package]] name = "proc-macro-error" From 4269217e28a0c334e87f811902874dc9358b7d9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 17:03:57 +0000 Subject: [PATCH 13/21] Bump regex from 1.5.4 to 1.5.5 Bumps [regex](https://github.com/rust-lang/regex) from 1.5.4 to 1.5.5. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.5.4...1.5.5) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ede9a..7ec9605 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 7c866d2..a446574 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" From aa5c03834fea25087ea88a6f8029eb7930410404 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 17:04:02 +0000 Subject: [PATCH 14/21] Bump anyhow from 1.0.56 to 1.0.57 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.56 to 1.0.57. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.56...1.0.57) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ede9a..f1b8658 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "atty" From b311b01336cfeaba95e46c521b8466686bfc9b9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 23:50:02 +0000 Subject: [PATCH 15/21] Bump ctrlc from 3.2.1 to 3.2.2 Bumps [ctrlc](https://github.com/Detegr/rust-ctrlc) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/Detegr/rust-ctrlc/releases) - [Commits](https://github.com/Detegr/rust-ctrlc/compare/3.2.1...3.2.2) --- updated-dependencies: - dependency-name: ctrlc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ede9a..dc6806b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,15 +85,15 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.8" +version = "3.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" +checksum = "535434c063ced786eb04aaf529308092c5ab60889e8fe24275d15de07b01fa97" dependencies = [ "atty", "bitflags", + "clap_lex", "indexmap", "lazy_static", - "os_str_bytes", "strsim", "termcolor", "terminal_size", @@ -102,13 +102,22 @@ dependencies = [ [[package]] name = "clap_complete" -version = "3.1.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" +checksum = "1d7ca9141e27e6ebc52e3c378b0c07f3cea52db46ed1cc5861735fb697b56356" dependencies = [ "clap", ] +[[package]] +name = "clap_lex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "crossbeam-utils" version = "0.8.7" @@ -121,11 +130,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.1" +version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" +checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" dependencies = [ - "nix", + "nix 0.24.1", "winapi", ] @@ -176,7 +185,7 @@ dependencies = [ "jemallocator", "libc", "lscolors", - "nix", + "nix 0.23.1", "normpath", "num_cpus", "once_cell", @@ -370,6 +379,17 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +dependencies = [ + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "normpath" version = "0.3.2" @@ -419,9 +439,6 @@ name = "os_str_bytes" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] [[package]] name = "proc-macro-error" From 3ad15721e06e54b4092f6be84f23f920e8195e07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 04:49:20 +0000 Subject: [PATCH 16/21] Bump nix from 0.23.1 to 0.24.1 Bumps [nix](https://github.com/nix-rust/nix) from 0.23.1 to 0.24.1. - [Release notes](https://github.com/nix-rust/nix/releases) - [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md) - [Commits](https://github.com/nix-rust/nix/compare/v0.23.1...v0.24.1) --- updated-dependencies: - dependency-name: nix dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 18 +++--------------- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f70366c..bdcf637 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -134,7 +134,7 @@ version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" dependencies = [ - "nix 0.24.1", + "nix", "winapi", ] @@ -185,7 +185,7 @@ dependencies = [ "jemallocator", "libc", "lscolors", - "nix 0.23.1", + "nix", "normpath", "num_cpus", "once_cell", @@ -366,19 +366,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.24.1" @@ -388,6 +375,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a446574..636d8c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ 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" From 4fecbe4ede971b17972f237f04c1affc049572a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 04:49:25 +0000 Subject: [PATCH 17/21] Bump libc from 0.2.121 to 0.2.125 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.121 to 0.2.125. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.121...0.2.125) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f70366c..f99318d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,9 +329,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.121" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] name = "log" From cbf3f11cf88884af8aff8c47f41c1ec12edf79c6 Mon Sep 17 00:00:00 2001 From: Jackson Theel Date: Mon, 21 Mar 2022 17:06:48 -0700 Subject: [PATCH 18/21] Make -u idempotent --- src/app.rs | 8 ++++---- src/main.rs | 2 +- tests/tests.rs | 14 +------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/app.rs b/src/app.rs index 01ddc1d..0b5578e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -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("Alias for '--no-ignore', and '--hidden'") .long_help( - "Alias for '--no-ignore'. Can be repeated. '-uu' is an alias for \ - '--no-ignore --hidden'.", + "Perform a search with no filters applied. Unfilters ignored \ + files and hidden files.", ), ) .arg( diff --git a/src/main.rs b/src/main.rs index 8bcd05e..6909ebf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -256,7 +256,7 @@ fn construct_config(matches: clap::ArgMatches, pattern_regex: &str) -> Result= 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") diff --git a/tests/tests.rs b/tests/tests.rs index 3436437..fb4ec59 100644 --- a/tests/tests.rs +++ b/tests/tests.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); From f823eac67285013dcf58d3e1cada278f20fac058 Mon Sep 17 00:00:00 2001 From: Jackson Theel <62031868+jacksontheel@users.noreply.github.com> Date: Mon, 21 Mar 2022 21:20:55 -0600 Subject: [PATCH 19/21] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbee00..1e00e4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ## Changes - +- Changed `-u` flag to be equivalent to `-HI`. Multiple `-u` flags still allowed but do nothing, see #840 (@jacksontheel) ## Other - Added installation instructions for RHEL8, see #989 (@ethsol) From f57206a3a13c76ad0d5eae22c2f53b42ca600040 Mon Sep 17 00:00:00 2001 From: David Peter Date: Sun, 15 May 2022 16:15:46 +0200 Subject: [PATCH 20/21] Update help text and man page --- doc/fd.1 | 2 +- src/app.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/fd.1 b/doc/fd.1 index 620af8b..314b0a1 100644 --- a/doc/fd.1 +++ b/doc/fd.1 @@ -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 diff --git a/src/app.rs b/src/app.rs index 0b5578e..d7cdc3f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -104,10 +104,10 @@ pub fn build_app() -> Command<'static> { .overrides_with_all(&["ignore", "no-hidden"]) .multiple_occurrences(true) // Allowed for historical reasons .hide_short_help(true) - .help("Alias for '--no-ignore', and '--hidden'") + .help("Unrestricted search, alias for '--no-ignore --hidden'") .long_help( - "Perform a search with no filters applied. Unfilters ignored \ - files and hidden files.", + "Perform an unrestricted search, including ignored and hidden files. This is \ + an alias for '--no-ignore --hidden'." ), ) .arg( From dcde6d358f857bd24b8f0d7a31973f1789a93ead Mon Sep 17 00:00:00 2001 From: David Peter Date: Sun, 15 May 2022 16:26:44 +0200 Subject: [PATCH 21/21] Add CHANGELOG entry for multi exec --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e00e4c..2a6e89d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,18 @@ ## Features +- Support multiple `--exec ` instances, see #406 and +#960 (@tmccombs) ## Bugfixes ## Changes + - Changed `-u` flag to be equivalent to `-HI`. Multiple `-u` flags still allowed but do nothing, see #840 (@jacksontheel) ## Other + - Added installation instructions for RHEL8, see #989 (@ethsol) # v8.3.2