wezterm-blob-leases: Use uuid v4 over v1

This commit is contained in:
Yiding Jia 2026-01-02 12:49:15 -08:00 committed by Wez Furlong
parent 31b1beda3f
commit 05343b3870
4 changed files with 2 additions and 38 deletions

21
Cargo.lock generated
View File

@ -357,15 +357,6 @@ dependencies = [
"openssl",
]
[[package]]
name = "atomic"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
dependencies = [
"bytemuck",
]
[[package]]
name = "atomic-waker"
version = "1.1.2"
@ -3261,16 +3252,6 @@ dependencies = [
"which",
]
[[package]]
name = "mac_address"
version = "1.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
dependencies = [
"nix",
"winapi",
]
[[package]]
name = "mach2"
version = "0.4.3"
@ -6342,7 +6323,6 @@ version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
dependencies = [
"atomic",
"getrandom 0.3.4",
"js-sys",
"rand 0.9.2",
@ -6708,7 +6688,6 @@ name = "wezterm-blob-leases"
version = "0.1.1"
dependencies = [
"getrandom 0.3.4",
"mac_address",
"serde",
"sha2",
"tempfile",

View File

@ -134,7 +134,6 @@ log = "0.4"
logging = { path = "lua-api-crates/logging" }
lru = "0.16"
luahelper = { path = "luahelper" }
mac_address = "1.1.8"
maplit = "1.0"
memmap2 = "0.9"
memmem = "0.1"

View File

@ -10,12 +10,11 @@ license = "MIT"
[dependencies]
getrandom.workspace = true
mac_address.workspace = true
serde = {workspace=true, features=["derive"], optional=true}
sha2.workspace = true
tempfile = {workspace=true, optional=true}
thiserror.workspace = true
uuid = {workspace=true, features=["v1", "rng"]}
uuid = {workspace=true, features=["v4", "rng"]}
[features]
default = []

View File

@ -1,4 +1,3 @@
use std::sync::LazyLock;
use uuid::Uuid;
/// Represents an individual lease
@ -14,21 +13,9 @@ impl std::fmt::Display for LeaseId {
}
}
fn get_mac_address() -> [u8; 6] {
match mac_address::get_mac_address() {
Ok(Some(addr)) => addr.bytes(),
_ => {
let mut mac = [0u8; 6];
getrandom::fill(&mut mac).ok();
mac
}
}
}
impl LeaseId {
pub fn new() -> Self {
static MAC: LazyLock<[u8; 6]> = LazyLock::new(get_mac_address);
let uuid = Uuid::now_v1(&*MAC);
let uuid = Uuid::new_v4();
let pid = std::process::id();
Self { uuid, pid }
}