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/tsc/diagnostics.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cli/tsc/diagnostics.rs') diff --git a/cli/tsc/diagnostics.rs b/cli/tsc/diagnostics.rs index a865daa9d..1e9819309 100644 --- a/cli/tsc/diagnostics.rs +++ b/cli/tsc/diagnostics.rs @@ -6,6 +6,7 @@ use deno_core::serde::Deserialize; use deno_core::serde::Deserializer; use deno_core::serde::Serialize; use deno_core::serde::Serializer; +use lazy_regex::lazy_regex; use once_cell::sync::Lazy; use regex::Regex; use std::error::Error; @@ -36,13 +37,11 @@ const UNSTABLE_DENO_PROPS: &[&str] = &[ "osUptime", ]; -static MSG_MISSING_PROPERTY_DENO: Lazy = Lazy::new(|| { - Regex::new(r#"Property '([^']+)' does not exist on type 'typeof Deno'"#) - .unwrap() -}); +static MSG_MISSING_PROPERTY_DENO: Lazy = + lazy_regex!(r#"Property '([^']+)' does not exist on type 'typeof Deno'"#); static MSG_SUGGESTION: Lazy = - Lazy::new(|| Regex::new(r#" Did you mean '([^']+)'\?"#).unwrap()); + lazy_regex!(r#" Did you mean '([^']+)'\?"#); /// Potentially convert a "raw" diagnostic message from TSC to something that /// provides a more sensible error message given a Deno runtime context. -- cgit v1.2.3