Skip to content

Commit 6943971

Browse files
committed
main.rs: refactor filter regex handling
1 parent f26d5c9 commit 6943971

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

rewatch/src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ fn main() -> Result<()> {
3131
cli::Command::Build(build_args) => {
3232
let _lock = get_lock(&build_args.folder);
3333

34-
let filter = build_args
35-
.filter
36-
.as_ref()
37-
.map(|filter| Regex::new(&filter).expect("Could not parse regex"));
34+
let filter = parse_filter_regex(&build_args.filter);
3835

3936
match build::build(
4037
&filter,
@@ -60,10 +57,7 @@ fn main() -> Result<()> {
6057
cli::Command::Watch(watch_args) => {
6158
let _lock = get_lock(&watch_args.folder);
6259

63-
let filter = watch_args
64-
.filter
65-
.as_ref()
66-
.map(|filter| Regex::new(&filter).expect("Could not parse regex"));
60+
let filter = parse_filter_regex(&watch_args.filter);
6761
watcher::start(
6862
&filter,
6963
show_progress,
@@ -107,6 +101,12 @@ fn main() -> Result<()> {
107101
}
108102
}
109103

104+
fn parse_filter_regex(filter: &Option<String>) -> Option<Regex> {
105+
filter
106+
.as_ref()
107+
.map(|filter| Regex::new(&filter).expect("Could not parse filter regex"))
108+
}
109+
110110
fn get_lock(folder: &str) -> lock::Lock {
111111
match lock::get(folder) {
112112
lock::Lock::Error(error) => {

0 commit comments

Comments
 (0)