cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace lazy_static with LazyLock

Browse source
This commit is contained in:
Tristan Ross 2026-01-27 12:02:42 -08:00
parent 4a3163d18a
commit 4551c2b378
No known key found for this signature in database
GPG key ID: 58BB826E9F8688F4
6 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix-bindings-expr/Cargo.toml
View file

@ -19,7 +19,6 @@ nix-bindings-bdwgc-sys = { path = "../nix-bindings-bdwgc-sys", version = "0.2.1"
nix-bindings-util-sys = { path = "../nix-bindings-util-sys", version = "0.2.1" }
nix-bindings-store-sys = { path = "../nix-bindings-store-sys", version = "0.2.1" }
nix-bindings-expr-sys = { path = "../nix-bindings-expr-sys", version = "0.2.1" }
lazy_static = "1.4"
ctor = "0.2"
tempfile = "3.10"
cstr = "0.2"

17
nix-bindings-expr/src/eval_state.rs
View file

@ -133,7 +133,6 @@ use crate::value::{Int, Value, ValueType};
use anyhow::Context as _;
use anyhow::{bail, Result};
use cstr::cstr;
use lazy_static::lazy_static;
use nix_bindings_bdwgc_sys as gc;
use nix_bindings_expr_sys as raw;
use nix_bindings_store::path::StorePath;
@ -148,17 +147,13 @@ use std::ffi::{c_char, CString};
use std::iter::FromIterator;
use std::os::raw::c_uint;
use std::ptr::{null, null_mut, NonNull};
use std::sync::{Arc, Weak};
use std::sync::{Arc, LazyLock, Weak};
lazy_static! {
static ref INIT: Result<()> = {
unsafe {
gc::GC_allow_register_threads();
check_call!(raw::libexpr_init(&mut Context::new()))?;
Ok(())
}
};
}
static INIT: LazyLock<Result<()>> = LazyLock::new(|| unsafe {
gc::GC_allow_register_threads();
check_call!(raw::libexpr_init(&mut Context::new()))?;
Ok(())
});
pub fn init() -> Result<()> {
let x = INIT.as_ref();