From 6cba51d90804ff187a70eef9b0f661f1a5d90c7b Mon Sep 17 00:00:00 2001 From: Christian Schilling Date: Tue, 9 May 2023 13:12:34 +0200 Subject: [PATCH] Rename Glob to Pattern Just an internal rename Change: glob-to-pattern --- josh-core/src/filter/mod.rs | 6 +++--- josh-core/src/filter/opt.rs | 2 +- josh-core/src/filter/parse.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/josh-core/src/filter/mod.rs b/josh-core/src/filter/mod.rs index a6423be1e..ca1257df6 100644 --- a/josh-core/src/filter/mod.rs +++ b/josh-core/src/filter/mod.rs @@ -156,7 +156,7 @@ enum Op { Subdir(std::path::PathBuf), Workspace(std::path::PathBuf), - Glob(String), + Pattern(String), Message(String), Compose(Vec), @@ -486,7 +486,7 @@ fn spec2(op: &Op) -> String { Op::Subdir(path) => format!(":/{}", parse::quote_if(&path.to_string_lossy())), Op::File(path) => format!("::{}", parse::quote_if(&path.to_string_lossy())), Op::Prefix(path) => format!(":prefix={}", parse::quote_if(&path.to_string_lossy())), - Op::Glob(pattern) => format!("::{}", parse::quote_if(pattern)), + Op::Pattern(pattern) => format!("::{}", parse::quote_if(pattern)), Op::Author(author, email) => { format!(":author={};{}", parse::quote(author), parse::quote(email)) } @@ -1011,7 +1011,7 @@ fn apply2<'a>( Ok(t) } - Op::Glob(pattern) => { + Op::Pattern(pattern) => { let pattern = glob::Pattern::new(pattern)?; let options = glob::MatchOptions { case_sensitive: true, diff --git a/josh-core/src/filter/opt.rs b/josh-core/src/filter/opt.rs index 2c0b933fc..96ca4c331 100644 --- a/josh-core/src/filter/opt.rs +++ b/josh-core/src/filter/opt.rs @@ -494,7 +494,7 @@ pub fn invert(filter: Filter) -> JoshResult { Op::Subdir(path) => Some(Op::Prefix(path)), Op::File(path) => Some(Op::File(path)), Op::Prefix(path) => Some(Op::Subdir(path)), - Op::Glob(pattern) => Some(Op::Glob(pattern)), + Op::Pattern(pattern) => Some(Op::Pattern(pattern)), Op::Rev(_) => Some(Op::Nop), Op::RegexReplace(_) => Some(Op::Nop), _ => None, diff --git a/josh-core/src/filter/parse.rs b/josh-core/src/filter/parse.rs index cc9b62fe5..505661f4d 100644 --- a/josh-core/src/filter/parse.rs +++ b/josh-core/src/filter/parse.rs @@ -77,7 +77,7 @@ fn parse_item(pair: pest::iterators::Pair) -> JoshResult { to_filter(make_op(&["prefix", arg])?), )) } else if arg.contains('*') { - Ok(Op::Glob(arg.to_string())) + Ok(Op::Pattern(arg.to_string())) } else { Ok(Op::File(Path::new(arg).to_owned())) }