Merge pull request #1283 from cgwalters/drop-once-cell

Port from once_cell to std

Author: cgwalters

Cargo.lock

@@ -34,7 +34,6 @@ gvariant = "0.5.0"
 hex = { workspace = true }
 io-lifetimes = "2"
 indicatif = { workspace = true }
-once_cell = "1.9"
 libc = { workspace = true }
 libsystemd = "0.7.0"
 openssl = { workspace = true }

ostree-ext/Cargo.toml

@@ -24,7 +24,6 @@ use gvariant::{Marker, Structure};
 use io_lifetimes::AsFd;
 use ocidir::cap_std::fs::{DirBuilder, DirBuilderExt as _};
 use ocidir::oci_spec::image::ImageConfigurationBuilder;
-use once_cell::sync::Lazy;
 use regex::Regex;
 use std::borrow::Cow;
 use std::ffi::CString;
@@ -33,7 +32,7 @@ use std::io::{self, Write};
 use std::ops::Add;
 use std::process::{Command, Stdio};
 use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use tempfile::TempDir;
 
 const OSTREE_GPG_HOME: &[u8] = include_bytes!("fixtures/ostree-gpg-test-home.tar.gz");
@@ -183,7 +182,7 @@ impl FileDef {
 }
 
 /// This is like a package database, mapping our test fixture files to package names
-static OWNERS: Lazy<Vec<(Regex, &str)>> = Lazy::new(|| {
+static OWNERS: LazyLock<Vec<(Regex, &str)>> = LazyLock::new(|| {
     [
         ("usr/lib/modules/.*/initramfs", "initramfs"),
         ("usr/lib/modules", "kernel"),

ostree-ext/src/fixture.rs

@@ -4,9 +4,9 @@ use super::Result;
 use camino::{Utf8Path, Utf8PathBuf};
 use cap_std_ext::cap_std::fs::Dir;
 use cap_std_ext::RootDir;
-use once_cell::sync::OnceCell;
 use ostree::glib;
 use std::fs::File;
+use std::sync::OnceLock;
 
 struct ConfigPaths {
     persistent: Utf8PathBuf,
@@ -19,10 +19,10 @@ struct ConfigPaths {
 /// user(nonroot) case: /run/user/$uid/ostree ~/.config/ostree   <none>
 fn get_config_paths(root: bool) -> &'static ConfigPaths {
     if root {
-        static PATHS_ROOT: OnceCell<ConfigPaths> = OnceCell::new();
+        static PATHS_ROOT: OnceLock<ConfigPaths> = OnceLock::new();
         PATHS_ROOT.get_or_init(|| ConfigPaths::new("etc", "run", Some("usr/lib")))
     } else {
-        static PATHS_USER: OnceCell<ConfigPaths> = OnceCell::new();
+        static PATHS_USER: OnceLock<ConfigPaths> = OnceLock::new();
         PATHS_USER.get_or_init(|| {
             ConfigPaths::new(
                 Utf8PathBuf::try_from(glib::user_config_dir()).unwrap(),

ostree-ext/src/globals.rs

@@ -1,21 +1,19 @@
 use std::process::Command;
-
-use once_cell::sync::Lazy;
+use std::sync::OnceLock;
 
 pub(crate) const DEFAULT_UNPRIVILEGED_USER: &str = "nobody";
 
 /// Checks if the current process is (apparently at least)
 /// running under systemd.  We use this in various places
 /// to e.g. log to the journal instead of printing to stdout.
 pub(crate) fn running_in_systemd() -> bool {
-    static RUNNING_IN_SYSTEMD: Lazy<bool> = Lazy::new(|| {
+    static RUNNING_IN_SYSTEMD: OnceLock<bool> = OnceLock::new();
+    *RUNNING_IN_SYSTEMD.get_or_init(|| {
         // See https://www.freedesktop.org/software/systemd/man/systemd.exec.html#%24INVOCATION_ID
         std::env::var_os("INVOCATION_ID")
             .filter(|s| !s.is_empty())
             .is_some()
-    });
-
-    *RUNNING_IN_SYSTEMD
+    })
 }
 
 /// Return a prepared subprocess configuration that will run as an unprivileged user if possible.

ostree-ext/src/isolation.rs

@@ -10,7 +10,6 @@ use gvariant::{Marker, Structure};
 use oci_image::ImageManifest;
 use oci_spec::image as oci_image;
 use ocidir::oci_spec::image::{Arch, DigestAlgorithm};
-use once_cell::sync::{Lazy, OnceCell};
 use ostree_ext::chunking::ObjectMetaSized;
 use ostree_ext::container::{store, ManifestDiff};
 use ostree_ext::container::{
@@ -24,6 +23,7 @@ use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::io::{BufReader, BufWriter};
 use std::process::{Command, Stdio};
+use std::sync::{LazyLock, OnceLock};
 use std::time::SystemTime;
 use xshell::cmd;
 
@@ -36,7 +36,7 @@ const TEST_REGISTRY_DEFAULT: &str = "localhost:5000";
 
 /// Check if we have skopeo
 fn check_skopeo() -> bool {
-    static HAVE_SKOPEO: OnceCell<bool> = OnceCell::new();
+    static HAVE_SKOPEO: OnceLock<bool> = OnceLock::new();
     *HAVE_SKOPEO.get_or_init(|| {
         Command::new("skopeo")
             .arg("--help")
@@ -56,10 +56,11 @@ fn assert_err_contains<T>(r: Result<T>, s: impl AsRef<str>) {
     }
 }
 
-static TEST_REGISTRY: Lazy<String> = Lazy::new(|| match std::env::var_os("TEST_REGISTRY") {
-    Some(t) => t.to_str().unwrap().to_owned(),
-    None => TEST_REGISTRY_DEFAULT.to_string(),
-});
+static TEST_REGISTRY: LazyLock<String> =
+    LazyLock::new(|| match std::env::var_os("TEST_REGISTRY") {
+        Some(t) => t.to_str().unwrap().to_owned(),
+        None => TEST_REGISTRY_DEFAULT.to_string(),
+    });
 
 // This is mostly just sanity checking these functions are publicly accessible
 #[test]