File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ enum Op {
156
156
Subdir ( std:: path:: PathBuf ) ,
157
157
Workspace ( std:: path:: PathBuf ) ,
158
158
159
- Glob ( String ) ,
159
+ Pattern ( String ) ,
160
160
Message ( String ) ,
161
161
162
162
Compose ( Vec < Filter > ) ,
@@ -486,7 +486,7 @@ fn spec2(op: &Op) -> String {
486
486
Op :: Subdir ( path) => format ! ( ":/{}" , parse:: quote_if( & path. to_string_lossy( ) ) ) ,
487
487
Op :: File ( path) => format ! ( "::{}" , parse:: quote_if( & path. to_string_lossy( ) ) ) ,
488
488
Op :: Prefix ( path) => format ! ( ":prefix={}" , parse:: quote_if( & path. to_string_lossy( ) ) ) ,
489
- Op :: Glob ( pattern) => format ! ( "::{}" , parse:: quote_if( pattern) ) ,
489
+ Op :: Pattern ( pattern) => format ! ( "::{}" , parse:: quote_if( pattern) ) ,
490
490
Op :: Author ( author, email) => {
491
491
format ! ( ":author={};{}" , parse:: quote( author) , parse:: quote( email) )
492
492
}
@@ -1011,7 +1011,7 @@ fn apply2<'a>(
1011
1011
Ok ( t)
1012
1012
}
1013
1013
1014
- Op :: Glob ( pattern) => {
1014
+ Op :: Pattern ( pattern) => {
1015
1015
let pattern = glob:: Pattern :: new ( pattern) ?;
1016
1016
let options = glob:: MatchOptions {
1017
1017
case_sensitive : true ,
Original file line number Diff line number Diff line change @@ -494,7 +494,7 @@ pub fn invert(filter: Filter) -> JoshResult<Filter> {
494
494
Op :: Subdir ( path) => Some ( Op :: Prefix ( path) ) ,
495
495
Op :: File ( path) => Some ( Op :: File ( path) ) ,
496
496
Op :: Prefix ( path) => Some ( Op :: Subdir ( path) ) ,
497
- Op :: Glob ( pattern) => Some ( Op :: Glob ( pattern) ) ,
497
+ Op :: Pattern ( pattern) => Some ( Op :: Pattern ( pattern) ) ,
498
498
Op :: Rev ( _) => Some ( Op :: Nop ) ,
499
499
Op :: RegexReplace ( _) => Some ( Op :: Nop ) ,
500
500
_ => None ,
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ fn parse_item(pair: pest::iterators::Pair<Rule>) -> JoshResult<Op> {
77
77
to_filter ( make_op ( & [ "prefix" , arg] ) ?) ,
78
78
) )
79
79
} else if arg. contains ( '*' ) {
80
- Ok ( Op :: Glob ( arg. to_string ( ) ) )
80
+ Ok ( Op :: Pattern ( arg. to_string ( ) ) )
81
81
} else {
82
82
Ok ( Op :: File ( Path :: new ( arg) . to_owned ( ) ) )
83
83
}
You can’t perform that action at this time.
0 commit comments