From 268bb339f0c512f021cc94e102573432cf2696d0 Mon Sep 17 00:00:00 2001 From: sftse Date: Thu, 15 Jan 2026 13:14:30 +0100 Subject: [PATCH] build(tauri-macos-sign): remove once-cell-regex (#14766) Co-authored-by: Fabian-Lars --- .changes/change-pr-14766.md | 5 +++++ Cargo.lock | 3 ++- crates/tauri-macos-sign/Cargo.toml | 3 ++- crates/tauri-macos-sign/src/keychain/identity.rs | 10 ++++++---- 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .changes/change-pr-14766.md diff --git a/.changes/change-pr-14766.md b/.changes/change-pr-14766.md new file mode 100644 index 000000000..4fb885f88 --- /dev/null +++ b/.changes/change-pr-14766.md @@ -0,0 +1,5 @@ +--- +"tauri-macos-sign": patch:deps +--- + +Remove once-cell-regex from direct dependencies. diff --git a/Cargo.lock b/Cargo.lock index aae0d652c..c9d5e6511 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8799,11 +8799,12 @@ dependencies = [ "chrono", "dirs 6.0.0", "log", - "once-cell-regex", + "once_cell", "os_pipe", "p12", "plist", "rand 0.9.1", + "regex", "serde", "serde_json", "tempfile", diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index 9fc874364..309938c27 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -15,7 +15,8 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" tempfile = "3" x509-certificate = "0.23" -once-cell-regex = "0.2" +once_cell = "1" +regex = "1" os_pipe = "1" plist = "1" rand = "0.9" diff --git a/crates/tauri-macos-sign/src/keychain/identity.rs b/crates/tauri-macos-sign/src/keychain/identity.rs index a39c48423..6ac146915 100644 --- a/crates/tauri-macos-sign/src/keychain/identity.rs +++ b/crates/tauri-macos-sign/src/keychain/identity.rs @@ -2,7 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -use once_cell_regex::regex; +use once_cell::sync::OnceCell; +use regex::Regex; use std::{collections::BTreeSet, path::Path, process::Command}; use x509_certificate::certificate::X509Certificate; @@ -49,9 +50,10 @@ impl Team { organization } else { println!( - "found cert {common_name:?} but failed to get organization; falling back to displaying common name" - ); - regex!(r"Apple Develop\w+: (.*) \(.+\)") + "found cert {common_name:?} but failed to get organization; falling back to displaying common name" + ); + static APPLE_DEV: OnceCell = OnceCell::new(); + APPLE_DEV.get_or_init(|| Regex::new(r"Apple Develop\w+: (.*) \(.+\)").unwrap()) .captures(&common_name) .map(|caps| caps[1].to_owned()) .unwrap_or_else(|| {