From 2d6dd0aae15dfa3636f9bccdec35ddd8ce27e966 Mon Sep 17 00:00:00 2001 From: Roland Peelen Date: Tue, 2 Jan 2024 13:52:05 +0100 Subject: [PATCH] :recycle: - Nest match instead of repeating --- src/main.rs | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6648165..980c1b2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -57,27 +57,27 @@ fn main() { .filter .map(|filter| Regex::new(filter.as_ref()).expect("Could not parse regex")); - match (lock::get(&folder), command) { - (lock::Lock::Error(ref e), _) => { + match lock::get(&folder) { + lock::Lock::Error(ref e) => { eprintln!("Error while trying to get lock: {}", e.to_string()); std::process::exit(1) } - (lock::Lock::Aquired(_), Command::Clean) => { - build::clean::clean(&folder); - } - (lock::Lock::Aquired(_), Command::Build) => { - match build::build(&filter, &folder, args.no_timing.unwrap_or(false)) { - Err(()) => std::process::exit(1), - Ok(_) => { - args.after_build.map(|command| cmd::run(command)); - std::process::exit(0) - } - }; - } - (lock::Lock::Aquired(_), Command::Watch) => { - let _initial_build = build::build(&filter, &folder, false); - args.after_build.clone().map(|command| cmd::run(command)); - watcher::start(&filter, &folder, args.after_build); - } + lock::Lock::Aquired(_) => match command { + Command::Clean => build::clean::clean(&folder), + Command::Build => { + match build::build(&filter, &folder, args.no_timing.unwrap_or(false)) { + Err(()) => std::process::exit(1), + Ok(_) => { + args.after_build.map(|command| cmd::run(command)); + std::process::exit(0) + } + }; + } + Command::Watch => { + let _initial_build = build::build(&filter, &folder, false); + args.after_build.clone().map(|command| cmd::run(command)); + watcher::start(&filter, &folder, args.after_build); + } + }, } }