rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a OnceLock static for LIBRARIES instead of thread_local! static

Browse Source
This commit is contained in:
Bennet Bleßmann
2024-07-25 18:58:29 +02:00
parent 6b50ec328c
commit 0da313eb84
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/mod.rs
View File

@@ -120,23 +120,25 @@ fn current_dir() -> PathBuf {
mod libraries { mod libraries {
use indexmap::IndexMap; use indexmap::IndexMap;
use std::sync::OnceLock;
std::thread_local! { fn libraries() -> &'static IndexMap<&'static str, &'static str> {
static LIBRARIES: IndexMap<&'static str, &'static str> = { static LIBRARIES: OnceLock<IndexMap<&'static str, &'static str>> = OnceLock::new();
LIBRARIES.get_or_init(|| {
let mut m = IndexMap::new(); let mut m = IndexMap::new();
include!(concat!(env!("OUT_DIR"), "/libraries.rs")); include!(concat!(env!("OUT_DIR"), "/libraries.rs"));
m m
} })
} }
pub(crate) fn contains(name: &str) -> bool { pub(crate) fn contains(name: &str) -> bool {
LIBRARIES.with(|libs| libs.contains_key(name)) libraries().contains_key(name)
} }
pub(crate) fn get(name: &str) -> Option<&'static str> { pub(crate) fn get(name: &str) -> Option<&'static str> {
LIBRARIES.with(|libs| libs.get(name).copied()) libraries().get(name).copied()
} }
} }