From 94993ca6c2af04df8861dee7d85b438f8e812327 Mon Sep 17 00:00:00 2001 From: Simon Engmann Date: Mon, 30 Dec 2019 21:49:22 +0100 Subject: [PATCH] Rename `--same-file-system` to `--one-file-system` --- README.md | 28 ++++++++++++++-------------- src/app.rs | 4 ++-- src/internal/opts.rs | 2 +- src/main.rs | 2 +- src/walk.rs | 2 +- tests/tests.rs | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index a41fe65..eb32da8 100644 --- a/README.md +++ b/README.md @@ -285,20 +285,20 @@ USAGE: fd [FLAGS/OPTIONS] [] [...] FLAGS: - -H, --hidden Search hidden files and directories - -I, --no-ignore Do not respect .(git|fd)ignore files - --no-ignore-vcs Do not respect .gitignore files - -s, --case-sensitive Case-sensitive search (default: smart case) - -i, --ignore-case Case-insensitive search (default: smart case) - -g, --glob Glob-based search (default: regular expression) - -F, --fixed-strings Treat the pattern as a literal string - -a, --absolute-path Show absolute instead of relative paths - -L, --follow Follow symbolic links - --same-file-system Don't cross file system boundaries (only Unix/Windows) - -p, --full-path Search full path (default: file-/dirname only) - -0, --print0 Separate results by the null character - -h, --help Prints help information - -V, --version Prints version information + -H, --hidden Search hidden files and directories + -I, --no-ignore Do not respect .(git|fd)ignore files + --no-ignore-vcs Do not respect .gitignore files + -s, --case-sensitive Case-sensitive search (default: smart case) + -i, --ignore-case Case-insensitive search (default: smart case) + -g, --glob Glob-based search (default: regular expression) + -F, --fixed-strings Treat the pattern as a literal string + -a, --absolute-path Show absolute instead of relative paths + -L, --follow Follow symbolic links + --one-file-system Don't cross file system boundaries (only Unix/Windows) + -p, --full-path Search full path (default: file-/dirname only) + -0, --print0 Separate results by the null character + -h, --help Prints help information + -V, --version Prints version information OPTIONS: -d, --max-depth Set maximum search depth (default: none) diff --git a/src/app.rs b/src/app.rs index a2bfecb..2b3724f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -115,7 +115,7 @@ pub fn build_app() -> App<'static, 'static> { .alias("dereference") .overrides_with("follow"), ) - .arg(arg("same-file-system").long("same-file-system")) + .arg(arg("one-file-system").long("one-file-system")) .arg( arg("full-path") .long("full-path") @@ -330,7 +330,7 @@ fn usage() -> HashMap<&'static str, Help> { , "Follow symbolic links" , "By default, fd does not descend into symlinked directories. Using this flag, symbolic \ links are also traversed."); - doc!(h, "same-file-system" + doc!(h, "one-file-system" , "Don't cross file system boundaries (only Unix/Windows)" , "By default, fd will traverse the file system tree as far as other options dictate. \ With this flag, fd ensures that it does not descend into a different file system than \ diff --git a/src/internal/opts.rs b/src/internal/opts.rs index 6ac1a20..b3feb1c 100644 --- a/src/internal/opts.rs +++ b/src/internal/opts.rs @@ -29,7 +29,7 @@ pub struct FdOptions { pub follow_links: bool, /// Whether to limit the search to starting file system or not. - pub same_file_system: bool, + pub one_file_system: bool, /// Whether elements of output should be separated by a null character pub null_separator: bool, diff --git a/src/main.rs b/src/main.rs index 544ba78..f80743c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -208,7 +208,7 @@ fn main() { || matches.is_present("rg-alias-hidden-ignore") || matches.is_present("no-ignore-vcs")), follow_links: matches.is_present("follow"), - same_file_system: matches.is_present("same-file-system"), + one_file_system: matches.is_present("one-file-system"), null_separator: matches.is_present("null_separator"), max_depth: matches .value_of("depth") diff --git a/src/walk.rs b/src/walk.rs index ddd00ee..75f9b5c 100644 --- a/src/walk.rs +++ b/src/walk.rs @@ -79,7 +79,7 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc, config: Arc) - .overrides(overrides) .follow_links(config.follow_links) // Same file system is only supported on Unix and Windows platforms - .same_file_system(config.same_file_system && (cfg!(unix) || cfg!(windows))) + .same_file_system(config.one_file_system && (cfg!(unix) || cfg!(windows))) .max_depth(config.max_depth); if config.read_fdignore { diff --git a/tests/tests.rs b/tests/tests.rs index d890edc..7a7e3ff 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -555,7 +555,7 @@ fn test_follow() { ); } -// File system boundaries (--same-file-system) +// File system boundaries (--one-file-system) // Limited to Unix because, to the best of my knowledge, there is no easy way to test a use case // file systems mounted into the tree on Windows. // Not limiting depth causes massive delay under Darwin, see BurntSushi/ripgrep#1429 @@ -572,7 +572,7 @@ fn test_file_system_boundaries() { ); te.assert_output( &[ - "--same-file-system", + "--one-file-system", "--full-path", "--max-depth", "2",