.github/workflows/ci.yml

@@ -41,6 +41,11 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust-version }}
+      - name: Generating the Cargo.lock
+        run: cargo generate-lockfile
+      - name: Downgrading once_cell
+        if: matrix.rust-version == 1.63
+        run: cargo update -p once_cell --precise 1.20.3
       - name: Build
         run: cargo build
       - name: Test

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.19.0
+
+- Remove direct dependency on `cfg-if`. It's still in the tree, but we didn't really need to use it in this crate.
+- Add an unstable feature (`unstable-windows-keep-open-tempfile`) to test a potential fix to #339.
+
 ## 3.18.0
 
 - Update `rustix` to 1.0.0.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tempfile"
-version = "3.18.0"
+version = "3.19.0"
 authors = [
   "Steven Allen <steven@stebalien.com>",
   "The Rust Project Developers",
@@ -17,7 +17,6 @@ repository = "https://github.com/Stebalien/tempfile"
 description = "A library for managing temporary files and directories."
 
 [dependencies]
-cfg-if = "1"
 fastrand = "2.1.1"
 # Not available in stdlib until 1.70, but we support 1.63 to support Debian stable.
 once_cell = { version = "1.19.0", default-features = false, features = ["std"] }
@@ -41,3 +40,6 @@ doc-comment = "0.3"
 [features]
 default = ["getrandom"]
 nightly = []
+# Disables immediate deletion of newly opened tempfiles on windows, instead relying on the old
+# "delete on close" behavior. This will hopefully fix #339.
+unstable-windows-keep-open-tempfile = []

src/file/imp/mod.rs

@@ -1,12 +1,9 @@
-cfg_if::cfg_if! {
-    if #[cfg(any(unix, target_os = "redox", target_os = "wasi"))] {
-        mod unix;
-        pub use self::unix::*;
-    } else if #[cfg(windows)] {
-        mod windows;
-        pub use self::windows::*;
-    } else {
-        mod other;
-        pub use self::other::*;
-    }
-}
+#[cfg_attr(any(unix, target_os = "redox", target_os = "wasi"), path = "unix.rs")]
+#[cfg_attr(windows, path = "windows.rs")]
+#[cfg_attr(
+    not(any(unix, target_os = "redox", target_os = "wasi", windows)),
+    path = "other.rs"
+)]
+mod platform;
+
+pub use self::platform::*;

src/file/imp/unix.rs

@@ -1,14 +1,7 @@
 use std::ffi::OsStr;
 use std::fs::{self, File, OpenOptions};
 use std::io;
-cfg_if::cfg_if! {
-    if #[cfg(not(target_os = "wasi"))] {
-        use std::os::unix::fs::MetadataExt;
-    } else {
-        #[cfg(feature = "nightly")]
-        use std::os::wasi::fs::MetadataExt;
-    }
-}
+
 use crate::util;
 use std::path::Path;
 
@@ -88,6 +81,11 @@ fn create_unix(dir: &Path) -> io::Result<File> {
 
 #[cfg(any(not(target_os = "wasi"), feature = "nightly"))]
 pub fn reopen(file: &File, path: &Path) -> io::Result<File> {
+    #[cfg(not(target_os = "wasi"))]
+    use std::os::unix::fs::MetadataExt;
+    #[cfg(target_os = "wasi")]
+    use std::os::wasi::fs::MetadataExt;
+
     let new_file = OpenOptions::new().read(true).write(true).open(path)?;
     let old_meta = file.metadata()?;
     let new_meta = new_file.metadata()?;

src/file/imp/windows.rs

@@ -76,6 +76,7 @@ pub fn create(dir: &Path) -> io::Result<File> {
                 .open(path)?;
             // Attempt to delete the file by-handle. If this fails, do nothing; the file will be
             // deleted on close anyways.
+            #[cfg(not(feature = "unstable-windows-keep-open-tempfile"))]
             let _ = delete_open_file(&f);
             Ok(f)
         },