From d790ea7d533c3c48b09a2f16f3fef549aa96be78 Mon Sep 17 00:00:00 2001 From: Yiyu Lin Date: Thu, 13 Apr 2023 09:08:01 +0800 Subject: refactor(cli,ext,ops): cleanup `regex` with `lazy-regex` (#17296) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - bump deps: the newest `lazy-regex` need newer `oncecell` and `regex` - reduce `unwrap` - remove dep `lazy_static` - make more regex cached --------- Co-authored-by: Bartek Iwańczuk --- cli/tools/upgrade.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cli/tools/upgrade.rs') diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index 310d60d99..f16923bf8 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -289,9 +289,9 @@ pub async fn upgrade( let install_version = match upgrade_flags.version { Some(passed_version) => { - if upgrade_flags.canary - && !regex::Regex::new("^[0-9a-f]{40}$")?.is_match(&passed_version) - { + let re_hash = lazy_regex::regex!("^[0-9a-f]{40}$"); + + if upgrade_flags.canary && !re_hash.is_match(&passed_version) { bail!("Invalid commit hash passed"); } else if !upgrade_flags.canary && Version::parse_standard(&passed_version).is_err() -- cgit v1.2.3