diff --git a/pbs-tape/Cargo.toml b/pbs-tape/Cargo.toml index f4110706..142bbacd 100644 --- a/pbs-tape/Cargo.toml +++ b/pbs-tape/Cargo.toml @@ -4,13 +4,13 @@ version = "0.1.0" authors.workspace = true edition.workspace = true description = "LTO tape support" +rust-version.workspace = true [dependencies] anyhow.workspace = true bitflags.workspace = true endian_trait.workspace = true hex.workspace = true -lazy_static.workspace = true libc.workspace = true log.workspace = true nix.workspace = true diff --git a/pbs-tape/src/linux_list_drives.rs b/pbs-tape/src/linux_list_drives.rs index 39d2aac7..96227672 100644 --- a/pbs-tape/src/linux_list_drives.rs +++ b/pbs-tape/src/linux_list_drives.rs @@ -3,6 +3,7 @@ use std::fs::{File, OpenOptions}; use std::os::unix::fs::OpenOptionsExt; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; +use std::sync::LazyLock; use anyhow::{bail, format_err, Error}; use nix::fcntl::{fcntl, FcntlArg, OFlag}; @@ -12,10 +13,8 @@ use proxmox_sys::fs::scan_subdir; use pbs_api_types::{DeviceKind, OptionalDeviceIdentification, TapeDeviceInfo}; -lazy_static::lazy_static! { - static ref SCSI_GENERIC_NAME_REGEX: regex::Regex = - regex::Regex::new(r"^sg\d+$").unwrap(); -} +static SCSI_GENERIC_NAME_REGEX: LazyLock = + LazyLock::new(|| regex::Regex::new(r"^sg\d+$").unwrap()); /// List linux tape changer devices pub fn linux_tape_changer_list() -> Vec { diff --git a/pbs-tape/src/sg_tape/mam.rs b/pbs-tape/src/sg_tape/mam.rs index 4e995d0b..4a94fa92 100644 --- a/pbs-tape/src/sg_tape/mam.rs +++ b/pbs-tape/src/sg_tape/mam.rs @@ -1,5 +1,6 @@ use std::collections::HashMap; use std::os::unix::io::AsRawFd; +use std::sync::LazyLock; use anyhow::{bail, format_err, Error}; use endian_trait::Endian; @@ -114,18 +115,15 @@ static MAM_ATTRIBUTES: &[MamType] = &[ MamType::bin(0x10_01, 24, "Alternate Unique Cartridge Identify (Alt-UCI)"), ]; -lazy_static::lazy_static! { +static MAM_ATTRIBUTE_NAMES: LazyLock> = LazyLock::new(|| { + let mut map = HashMap::new(); - static ref MAM_ATTRIBUTE_NAMES: HashMap = { - let mut map = HashMap::new(); + for entry in MAM_ATTRIBUTES { + map.insert(entry.id, entry); + } - for entry in MAM_ATTRIBUTES { - map.insert(entry.id, entry); - } - - map - }; -} + map +}); fn read_tape_mam(file: &mut F) -> Result, Error> { let alloc_len: u32 = 32 * 1024;