Merge 7af0094 into ddec4cf

ARK-Builders · Jul 29, 2024 · 9544429 · 9544429
2 parents ddec4cf + 7af0094
commit 9544429
Show file tree

Hide file tree

Showing 4 changed files with 578 additions and 4 deletions.
diff --git a/fs-atomic-versions/src/atomic/file.rs b/fs-atomic-versions/src/atomic/file.rs
@@ -1,6 +1,6 @@
 use std::fs::{self, File};
 use std::io::{Error, ErrorKind, Read, Result};
-#[cfg(target_os = "unix")]
+#[cfg(target_family = "unix")]
 use std::os::unix::fs::MetadataExt;
 use std::path::{Path, PathBuf};
 
@@ -229,7 +229,7 @@ impl AtomicFile {
         // May return `EEXIST`.
         let res = std::fs::hard_link(&new.path, new_path);
         if let Err(err) = res {
-            #[cfg(target_os = "unix")]
+            #[cfg(target_family = "unix")]
             // From open(2) manual page:
             //
             // "[...] create a unique file on the same filesystem (e.g.,
@@ -241,7 +241,7 @@ impl AtomicFile {
             if new.path.metadata()?.nlink() != 2 {
                 Err(err)?;
             }
-            #[cfg(not(target_os = "unix"))]
+            #[cfg(not(target_family = "unix"))]
             Err(err)?;
         }
 

diff --git a/fs-storage/Cargo.toml b/fs-storage/Cargo.toml
@@ -17,7 +17,7 @@ serde_json = "1.0.82"
 serde = { version = "1.0.138", features = ["derive"] }
 jni = { version = "0.21.1", optional = true }
 jnix = { version = "0.5.1", features = ["derive"], optional = true }
-
+bincode = "1.3"
 data-error = { path = "../data-error" }