.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -13,6 +13,7 @@ jobs:
       matrix:
         rust-version:
           - nightly
+          - stable
           - "1.48"
         os:
           - ubuntu-latest
@@ -21,55 +22,56 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust-version }}
-          default: true
-      - name: Build
-        uses: actions-rs/cargo@v1
+      # Workaround link failures if XCode 14 is combined with Rust <= 1.53
+      - name: Downgrade to XCode 13
+        if: ${{ matrix.os == 'macos-latest' && matrix.rust-version == '1.48' }}
+        uses: maxim-lobanov/setup-xcode@v1
         with:
-          command: build
+          xcode-version: '13'
+      - name: Build
+        run: cargo build
       - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
+        run: cargo test
   wasi:
     name: WASI Test Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          default: true
+        uses: dtolnay/rust-toolchain@nightly
       - name: Install Cargo WASI
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-wasi
+        run: cargo install cargo-wasi
       - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: wasi
-          args: build --features nightly
+        run: cargo wasi build --features nightly
   wasm:
     name: WASM Test Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          target: wasm32-unknown-unknown
-          toolchain: stable
-          default: true
+          targets: wasm32-unknown-unknown
       - name: Build
-        uses: actions-rs/cargo@v1
+        run: cargo build --target wasm32-unknown-unknown
+  lint:
+    name: Clippy and fmt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
         with:
-          command: build
-          args: --target wasm32-unknown-unknown
+          components: clippy, rustfmt
+      - name: Check formatting
+        run: cargo fmt --check
+      - name: Check for clippy lints
+        run: cargo clippy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
 authors = [
   "Steven Allen <steven@stebalien.com>",
   "The Rust Project Developers",
@@ -9,6 +9,7 @@ authors = [
 ]
 documentation = "https://docs.rs/tempfile"
 edition = "2018"
+rust-version = "1.48"
 homepage = "https://stebalien.com/projects/tempfile-rs/"
 keywords = ["tempfile", "tmpfile", "filesystem"]
 license = "MIT OR Apache-2.0"
@@ -20,17 +21,17 @@ cfg-if = "1"
 fastrand = "1.6.0"
 
 [target.'cfg(any(unix, target_os = "wasi"))'.dependencies]
-rustix = { version = "0.36.0", features = ["fs"] }
+rustix = { version = "0.37.1", features = ["fs"] }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.42"
+version = "0.45"
 features = [
     "Win32_Storage_FileSystem",
     "Win32_Foundation",
 ]
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.2.9"
+redox_syscall = "0.3"
 
 [dev-dependencies]
 doc-comment = "0.3"

NEWS

@@ -1,7 +1,14 @@
+3.5.0
+=====
+
+- Update rustix from 0.36 to 0.37.1. This makes wasi work on rust stable
+- Update `windows-sys`, `redox_syscall`
+- BREAKING: Remove the implementation of `Write for &NamedTempFile<F> where &F: Write`. Unfortunately, this can cause compile issues in unrelated code (https://github.com/Stebalien/tempfile/issues/224).
+
 3.4.0
 =====
 
-SECURITY: Prior `tempfile` releases depended on `remove_dir_all` version 0.5.0 which was vulnerabiel to a [TOCTOU race](https://github.com/XAMPPRocky/remove_dir_all/security/advisories/GHSA-mc8h-8q98-g5hr). This same race is present in rust versions prior to 1.58.1.
+SECURITY: Prior `tempfile` releases depended on `remove_dir_all` version 0.5.0 which was vulnerable to a [TOCTOU race](https://github.com/XAMPPRocky/remove_dir_all/security/advisories/GHSA-mc8h-8q98-g5hr). This same race is present in rust versions prior to 1.58.1.
 
 Features:
 
@@ -235,7 +242,7 @@ Add LFS Support.
 2.0.0
 =====
 
-This release replaces `TempFile` with a `tempfile()` function that returnes
+This release replaces `TempFile` with a `tempfile()` function that returns
 `std::fs::File` objects. These are significantly more useful because most rust
 libraries expect normal `File` objects.
 

src/file/imp/other.rs

@@ -9,7 +9,7 @@ fn not_supported<T>() -> io::Result<T> {
     ))
 }
 
-pub fn create_named(_path: &Path, open_options: &mut OpenOptions) -> io::Result<File> {
+pub fn create_named(_path: &Path, _open_options: &mut OpenOptions) -> io::Result<File> {
     not_supported()
 }
 
@@ -25,6 +25,6 @@ pub fn persist(_old_path: &Path, _new_path: &Path, _overwrite: bool) -> io::Resu
     not_supported()
 }
 
-pub fn keep(path: &Path) -> io::Result<()> {
+pub fn keep(_path: &Path) -> io::Result<()> {
     not_supported()
 }

src/file/imp/unix.rs

@@ -135,7 +135,7 @@ pub fn persist(old_path: &Path, new_path: &Path, overwrite: bool) -> io::Result<
 }
 
 #[cfg(target_os = "redox")]
-pub fn persist(old_path: &Path, new_path: &Path, overwrite: bool) -> io::Result<()> {
+pub fn persist(_old_path: &Path, _new_path: &Path, _overwrite: bool) -> io::Result<()> {
     // XXX implement when possible
     Err(io::Error::from_raw_os_error(syscall::ENOSYS))
 }

src/file/mod.rs

@@ -918,10 +918,7 @@ impl<F: Read> Read for NamedTempFile<F> {
     }
 }
 
-impl<'a, F> Read for &'a NamedTempFile<F>
-where
-    &'a F: Read,
-{
+impl Read for &NamedTempFile<File> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         self.as_file().read(buf).with_err_path(|| self.path())
     }
@@ -937,10 +934,7 @@ impl<F: Write> Write for NamedTempFile<F> {
     }
 }
 
-impl<'a, F> Write for &'a NamedTempFile<F>
-where
-    &'a F: Write,
-{
+impl Write for &NamedTempFile<File> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.as_file().write(buf).with_err_path(|| self.path())
     }
@@ -956,10 +950,7 @@ impl<F: Seek> Seek for NamedTempFile<F> {
     }
 }
 
-impl<'a, F> Seek for &'a NamedTempFile<F>
-where
-    &'a F: Seek,
-{
+impl Seek for &NamedTempFile<File> {
     fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
         self.as_file().seek(pos).with_err_path(|| self.path())
     }

tests/namedtempfile.rs

@@ -439,3 +439,28 @@ fn test_make_uds_conflict() {
         assert!(socket.path().exists());
     }
 }
+
+// Issue #224.
+#[test]
+fn test_overly_generic_bounds() {
+    pub struct Foo<T>(T);
+
+    impl<T> Foo<T>
+    where
+        T: Sync + Send + 'static,
+        for<'a> &'a T: Write + Read,
+    {
+        pub fn new(foo: T) -> Self {
+            Self(foo)
+        }
+    }
+
+    // Don't really need to run this. Only care if it compiles.
+    if let Ok(file) = File::open("i_do_not_exist") {
+        let mut f;
+        let _x = {
+            f = Foo::new(file);
+            &mut f
+        };
+    }
+}