aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-24 09:46:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3935 from storytold/fix/main-clippy-bitmap

Browse Source 
Main's CI: an unnecessary map_or, testkit's Unix-only mut, and a shared temp-dir probe
This commit is contained in:
BFlat
2026-10-24 09:42:18 +07:00
committed by GitHub
parent 6c05c10fff e219543e58
commit 8808019ce2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/testkit/src/lib.rs
+5 -1
View File
@@ -44,6 +44,8 @@ pub use {vectorcraft_doc as doc, vectorcraft_format as format, vectorcraft_rende
/// real directory, not a link, with no access for others and writable by this user: one pre-made in a shared temp folder is refused. /// real directory, not a link, with no access for others and writable by this user: one pre-made in a shared temp folder is refused.
pub fn temp_dir(tag: &str) -> std::path::PathBuf { pub fn temp_dir(tag: &str) -> std::path::PathBuf {
let dir = std::env::temp_dir().join(format!("vectorcraft-testkit-{tag}-{}", std::process::id())); let dir = std::env::temp_dir().join(format!("vectorcraft-testkit-{tag}-{}", std::process::id()));
// Unix sets the mode on it; elsewhere it stays as made.
#[cfg_attr(not(unix), allow(unused_mut))]
let mut b = std::fs::DirBuilder::new(); let mut b = std::fs::DirBuilder::new();
#[cfg(unix)] #[cfg(unix)]
std::os::unix::fs::DirBuilderExt::mode(&mut b, 0o700); std::os::unix::fs::DirBuilderExt::mode(&mut b, 0o700);
@@ -54,7 +56,9 @@ pub fn temp_dir(tag: &str) -> std::path::PathBuf {
assert!(std::os::unix::fs::PermissionsExt::mode(&m.permissions()) & 0o077 == 0, "{}: not private", dir.display()); assert!(std::os::unix::fs::PermissionsExt::mode(&m.permissions()) & 0o077 == 0, "{}: not private", dir.display());
// A private directory made by another user passes the mode check but is closed to this one: // A private directory made by another user passes the mode check but is closed to this one:
// writing a probe file tells it apart from ours without needing the user ids. // writing a probe file tells it apart from ours without needing the user ids.
let probe = dir.join(".probe"); // Named for this call: tests running alongside probe the same directory.
static PROBES: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
let probe = dir.join(format!(".probe-{}", PROBES.fetch_add(1, std::sync::atomic::Ordering::Relaxed)));
assert!(std::fs::write(&probe, b"").and_then(|()| std::fs::remove_file(&probe)).is_ok(), "{}: not owned by this user", dir.display()); assert!(std::fs::write(&probe, b"").and_then(|()| std::fs::remove_file(&probe)).is_ok(), "{}: not owned by this user", dir.display());
} }
dir dir