diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/check.rs | 2 | ||||
| -rw-r--r-- | cli/tools/installer.rs | 2 | ||||
| -rw-r--r-- | cli/tools/test.rs | 16 | ||||
| -rw-r--r-- | cli/tools/upgrade.rs | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/cli/tools/check.rs b/cli/tools/check.rs index 804519e84..91643496a 100644 --- a/cli/tools/check.rs +++ b/cli/tools/check.rs @@ -321,7 +321,7 @@ fn get_tsc_roots( /// Matches the `@ts-check` pragma. static TS_CHECK_RE: Lazy<Regex> = - Lazy::new(|| Regex::new(r#"(?i)^\s*@ts-check(?:\s+|$)"#).unwrap()); + lazy_regex::lazy_regex!(r#"(?i)^\s*@ts-check(?:\s+|$)"#); fn has_ts_check(media_type: MediaType, file_text: &str) -> bool { match &media_type { diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index 3bffbacad..ec397f78a 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -35,7 +35,7 @@ static EXEC_NAME_RE: Lazy<Regex> = Lazy::new(|| { RegexBuilder::new(r"^[a-z][\w-]*$") .case_insensitive(true) .build() - .unwrap() + .expect("invalid regex") }); fn validate_name(exec_name: &str) -> Result<(), AnyError> { diff --git a/cli/tools/test.rs b/cli/tools/test.rs index ce99a6edc..7d6a6baa4 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -1031,8 +1031,8 @@ fn extract_files_from_source_comments( scope_analysis: false, })?; let comments = parsed_source.comments().get_vec(); - let blocks_regex = Regex::new(r"```([^\r\n]*)\r?\n([\S\s]*?)```")?; - let lines_regex = Regex::new(r"(?:\* ?)(?:\# ?)?(.*)")?; + let blocks_regex = lazy_regex::regex!(r"```([^\r\n]*)\r?\n([\S\s]*?)```"); + let lines_regex = lazy_regex::regex!(r"(?:\* ?)(?:\# ?)?(.*)"); let files = comments .iter() @@ -1049,8 +1049,8 @@ fn extract_files_from_source_comments( &comment.text, media_type, parsed_source.text_info().line_index(comment.start()), - &blocks_regex, - &lines_regex, + blocks_regex, + lines_regex, ) }) .flatten() @@ -1069,16 +1069,16 @@ fn extract_files_from_fenced_blocks( // check can be done to see if a block is inside a comment (and skip typechecking) // or not by checking for the presence of capturing groups in the matches. let blocks_regex = - Regex::new(r"(?s)<!--.*?-->|```([^\r\n]*)\r?\n([\S\s]*?)```")?; - let lines_regex = Regex::new(r"(?:\# ?)?(.*)")?; + lazy_regex::regex!(r"(?s)<!--.*?-->|```([^\r\n]*)\r?\n([\S\s]*?)```"); + let lines_regex = lazy_regex::regex!(r"(?:\# ?)?(.*)"); extract_files_from_regex_blocks( specifier, source, media_type, /* file line index */ 0, - &blocks_regex, - &lines_regex, + blocks_regex, + lines_regex, ) } 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() |