From d790ea7d533c3c48b09a2f16f3fef549aa96be78 Mon Sep 17 00:00:00 2001
From: Yiyu Lin <linyiyu1992@gmail.com>
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 <biwanczuk@gmail.com>
---
 ops/lib.rs | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'ops/lib.rs')

diff --git a/ops/lib.rs b/ops/lib.rs
index aee6c8c03..41f69d9fc 100644
--- a/ops/lib.rs
+++ b/ops/lib.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
 use attrs::Attributes;
-use once_cell::sync::Lazy;
 use optimizer::BailoutReason;
 use optimizer::Optimizer;
 use proc_macro::TokenStream;
@@ -9,7 +8,6 @@ use proc_macro2::Span;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 use quote::ToTokens;
-use regex::Regex;
 use syn::parse;
 use syn::parse_macro_input;
 use syn::punctuated::Punctuated;
@@ -859,30 +857,26 @@ fn is_unit_result(ty: impl ToTokens) -> bool {
 }
 
 fn is_resource_id(arg: impl ToTokens) -> bool {
-  static RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r#": (?:deno_core :: )?ResourceId$"#).unwrap());
-  RE.is_match(&tokens(arg))
+  let re = lazy_regex::regex!(r#": (?:deno_core :: )?ResourceId$"#);
+  re.is_match(&tokens(arg))
 }
 
 fn is_mut_ref_opstate(arg: impl ToTokens) -> bool {
-  static RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r#": & mut (?:deno_core :: )?OpState$"#).unwrap());
-  RE.is_match(&tokens(arg))
+  let re = lazy_regex::regex!(r#": & mut (?:deno_core :: )?OpState$"#);
+  re.is_match(&tokens(arg))
 }
 
 fn is_rc_refcell_opstate(arg: &syn::FnArg) -> bool {
-  static RE: Lazy<Regex> = Lazy::new(|| {
-    Regex::new(r#": Rc < RefCell < (?:deno_core :: )?OpState > >$"#).unwrap()
-  });
-  RE.is_match(&tokens(arg))
+  let re =
+    lazy_regex::regex!(r#": Rc < RefCell < (?:deno_core :: )?OpState > >$"#);
+  re.is_match(&tokens(arg))
 }
 
 fn is_handle_scope(arg: &syn::FnArg) -> bool {
-  static RE: Lazy<Regex> = Lazy::new(|| {
-    Regex::new(r#": & mut (?:deno_core :: )?v8 :: HandleScope(?: < '\w+ >)?$"#)
-      .unwrap()
-  });
-  RE.is_match(&tokens(arg))
+  let re = lazy_regex::regex!(
+    r#": & mut (?:deno_core :: )?v8 :: HandleScope(?: < '\w+ >)?$"#
+  );
+  re.is_match(&tokens(arg))
 }
 
 fn is_future(ty: impl ToTokens) -> bool {
-- 
cgit v1.2.3