Skip to content

Replace lazy_static with OnceLock #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
russellbanks wants to merge 3 commits into from
Closed

Replace lazy_static with OnceLock #160

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9937846
Replace lazy_static with OnceLock
russellbanks Jan 1, 2024
955a6fe
Use once_cell to maintain current MSRV
russellbanks Jan 2, 2024
0f82388
Revert "Use once_cell to maintain current MSRV"
russellbanks Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ linux-secret-service-rt-tokio-crypto-openssl = ["secret-service/rt-tokio-crypto-
linux-no-secret-service = ["linux-default-keyutils"]
linux-default-keyutils = ["linux-keyutils"]


[dependencies]
lazy_static = "1"
once_cell = "1"

[target.'cfg(target_os = "macos")'.dependencies]
security-framework = { version = "2.6", optional = true }
Expand Down
10 changes: 3 additions & 7 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,12 @@ pub fn set_default_credential_builder(new: Box<CredentialBuilder>) {
}

fn build_default_credential(target: Option<&str>, service: &str, user: &str) -> Result<Entry> {
lazy_static::lazy_static! {
static ref DEFAULT: Box<CredentialBuilder> = default::default_credential_builder();
}
static DEFAULT: once_cell::sync::Lazy<Box<CredentialBuilder>> =
once_cell::sync::Lazy::new(|| default::default_credential_builder());
let guard = DEFAULT_BUILDER
.read()
.expect("Poisoned RwLock in keyring-rs: please report a bug!");
let builder = match guard.inner.as_ref() {
Some(builder) => builder,
None => &DEFAULT,
};
let builder = guard.inner.as_ref().unwrap_or_else(|| &DEFAULT);
let credential = builder.build(target, service, user)?;
Ok(Entry { inner: credential })
}
Expand Down