codemod: drop usage of fs2

quark-zju · meta-codesync[bot] · commit 1892f36ca4f8 · 2026-01-23T10:36:57.000-08:00
Summary:
`fs2` was used for locking. Rust 1.89 introduced `File::lock` in stdlib.
So we can replace `fs2` with stdlib.

  - fs2::FileExt::lock_exclusive(&amp;f) → f.lock()
  - fs2::FileExt::lock_shared(&amp;f) → f.lock_shared()
  - fs2::FileExt::try_lock_exclusive(&amp;f) → f.try_lock()
  - fs2::FileExt::try_lock_shared(&amp;f) → f.try_lock_shared()
  - fs2::FileExt::unlock(&amp;f) → f.unlock()
  - fs2::FileExt::allocate(&amp;f, n) → f.set_len(n)
  - fs2::lock_contended_error().kind() → io::ErrorKind::WouldBlock
  - f.duplicate() → f.try_clone()

Mostly updated by claude.

Reviewed By: zzl0

Differential Revision: D91255666

fbshipit-source-id: 6fa13b90cf489f6842ef4165d293ad46422c704e
diff --git a/eden/scm/lib/commandserver/BUCK b/eden/scm/lib/commandserver/BUCK
@@ -41,7 +41,6 @@ rust_library(
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:dirs",
         "fbsource//third-party/rust:fn-error-context",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:once_cell",
         "fbsource//third-party/rust:serde",
         "fbsource//third-party/rust:tracing",
diff --git a/eden/scm/lib/commandserver/Cargo.toml b/eden/scm/lib/commandserver/Cargo.toml
@@ -16,7 +16,6 @@ name = "commandserver"
 anyhow = "1.0.98"
 dirs = "6.0"
 fn-error-context = "0.2"
-fs2 = "0.4"
 once_cell = "1.21"
 sapling-configmodel = { version = "0.1.0", path = "../config/model" }
 sapling-identity = { version = "0.1.0", path = "../identity" }
diff --git a/eden/scm/lib/commandserver/src/spawn.rs b/eden/scm/lib/commandserver/src/spawn.rs
@@ -23,7 +23,7 @@ pub fn spawn_pool(pool_size: usize) -> anyhow::Result<()> {
         .create(true)
         .write(true)
         .open(dir.join("spawn.lock"))?;
-    fs2::FileExt::lock_exclusive(&spawn_lock)?;
+    spawn_lock.lock()?;
 
     let existing = udsipc::pool::list_uds_paths(&dir, prefix)
         .take(pool_size)
diff --git a/eden/scm/lib/dag/BUCK b/eden/scm/lib/dag/BUCK
@@ -17,7 +17,6 @@ rust_library(
             },
         }},
         "extra_buck_dependencies": {"dev-dependencies": [
-            "fbsource//third-party/rust:fs2",
             "fbsource//third-party/rust:tokio",
             "//eden/scm/lib/dag/dag-types:dag-types",
             "//eden/scm/lib/indexedlog:indexedlog",
@@ -28,7 +27,6 @@ rust_library(
                 "render",
             ],
             "indexedlog-backend": [
-                "fs2",
                 "sapling-indexedlog",
                 "tempfile",
             ],
@@ -63,7 +61,6 @@ rust_library(
         "fbsource//third-party/rust:bitflags",
         "fbsource//third-party/rust:byteorder",
         "fbsource//third-party/rust:fail",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:futures",
         "fbsource//third-party/rust:indexmap",
         "fbsource//third-party/rust:rand",
diff --git a/eden/scm/lib/dag/Cargo.toml b/eden/scm/lib/dag/Cargo.toml
@@ -19,7 +19,6 @@ async-trait = "0.1.86"
 bitflags = { version = "2.9", features = ["serde", "std"], default-features = false }
 byteorder = "1.5"
 fail = { version = "0.4", features = ["failpoints"] }
-fs2 = { version = "0.4", optional = true }
 futures = { version = "0.3.31", features = ["async-await", "compat"] }
 indexmap = { version = "2.9.0", features = ["arbitrary", "rayon", "serde"] }
 rand = { version = "0.9", features = ["small_rng"] }
@@ -37,7 +36,6 @@ thiserror = "2.0.12"
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
 
 [dev-dependencies]
-fs2 = "0.4"
 once_cell = "1.21"
 quickcheck = "1.0"
 sapling-dag-types = { version = "0.1.0", path = "dag-types" }
@@ -49,5 +47,5 @@ tokio = { version = "1.47.1", features = ["full", "test-util", "tracing"] }
 
 [features]
 default = ["indexedlog-backend", "render"]
-indexedlog-backend = ["fs2", "sapling-indexedlog", "tempfile"]
+indexedlog-backend = ["sapling-indexedlog", "tempfile"]
 render = ["sapling-renderdag"]
diff --git a/eden/scm/lib/dag/src/iddagstore/indexedlog_store.rs b/eden/scm/lib/dag/src/iddagstore/indexedlog_store.rs
@@ -499,7 +499,7 @@ impl Persist for IndexedLogStore {
                 .create(true)
                 .open(&path)?
         };
-        fs2::FileExt::lock_exclusive(&lock_file)?;
+        lock_file.lock()?;
         Ok(lock_file)
     }
 
diff --git a/eden/scm/lib/dag/src/idmap/indexedlog_idmap.rs b/eden/scm/lib/dag/src/idmap/indexedlog_idmap.rs
@@ -519,7 +519,7 @@ impl Persist for IdMap {
                 .create(true)
                 .open(&path)?
         };
-        fs2::FileExt::lock_exclusive(&lock_file)?;
+        lock_file.lock()?;
         Ok(lock_file)
     }
 
diff --git a/eden/scm/lib/indexedlog/BUCK b/eden/scm/lib/indexedlog/BUCK
@@ -81,7 +81,6 @@ rust_library(
     test_labels = ["tpx-rust-no-backtrace-workaround"],
     deps = [
         "fbsource//third-party/rust:byteorder",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:memmap2",
         "fbsource//third-party/rust:once_cell",
         "fbsource//third-party/rust:rand",
diff --git a/eden/scm/lib/indexedlog/Cargo.toml b/eden/scm/lib/indexedlog/Cargo.toml
@@ -31,7 +31,6 @@ harness = false
 
 [dependencies]
 byteorder = "1.5"
-fs2 = "0.4"
 memmap2 = "0.9.5"
 once_cell = "1.21"
 rand = { version = "0.9", features = ["small_rng"] }
diff --git a/eden/scm/lib/indexedlog/src/index.rs b/eden/scm/lib/indexedlog/src/index.rs
@@ -89,7 +89,6 @@ use byteorder::ByteOrder;
 use byteorder::LittleEndian;
 use byteorder::ReadBytesExt;
 use byteorder::WriteBytesExt;
-use fs2::FileExt as _;
 use minibytes::Bytes;
 use tracing::debug_span;
 use twox_hash::XxHash;
@@ -2469,7 +2468,7 @@ impl Index {
 
     pub(crate) fn try_clone_internal(&self, copy_dirty: bool) -> crate::Result<Index> {
         let file = match &self.file {
-            Some(f) => Some(f.duplicate().context(self.path(), "cannot duplicate")?),
+            Some(f) => Some(f.try_clone().context(self.path(), "cannot duplicate")?),
             None => None,
         };
 
diff --git a/eden/scm/lib/indexedlog/src/lock.rs b/eden/scm/lib/indexedlog/src/lock.rs
@@ -26,9 +26,9 @@ pub struct ScopedFileLock<'a> {
 impl<'a> ScopedFileLock<'a> {
     pub fn new(file: &'a mut File, exclusive: bool) -> io::Result<Self> {
         if exclusive {
-            fs2::FileExt::lock_exclusive(file)?;
+            file.lock()?;
         } else {
-            fs2::FileExt::lock_shared(file)?;
+            file.lock_shared()?;
         }
         Ok(ScopedFileLock { file })
     }
@@ -48,7 +48,7 @@ impl<'a> AsMut<File> for ScopedFileLock<'a> {
 
 impl<'a> Drop for ScopedFileLock<'a> {
     fn drop(&mut self) {
-        fs2::FileExt::unlock(self.file).expect("unlock");
+        self.file.unlock().expect("unlock");
     }
 }
 
@@ -240,10 +240,10 @@ fn lock_file(file: &File, exclusive: bool, non_blocking: bool) -> io::Result<()>
     }
     #[cfg(not(windows))]
     match (exclusive, non_blocking) {
-        (true, false) => fs2::FileExt::lock_exclusive(file)?,
-        (true, true) => fs2::FileExt::try_lock_exclusive(file)?,
-        (false, false) => fs2::FileExt::lock_shared(file)?,
-        (false, true) => fs2::FileExt::try_lock_shared(file)?,
+        (true, false) => file.lock()?,
+        (true, true) => file.try_lock()?,
+        (false, false) => file.lock_shared()?,
+        (false, true) => file.try_lock_shared()?,
     }
     Ok(())
 }
@@ -263,7 +263,7 @@ fn unlock_file(file: &File) -> io::Result<()> {
     }
     #[cfg(not(windows))]
     {
-        fs2::FileExt::unlock(file)?;
+        file.unlock()?;
     }
     Ok(())
 }
diff --git a/eden/scm/lib/indexedlog/src/log/repair.rs b/eden/scm/lib/indexedlog/src/log/repair.rs
@@ -106,16 +106,15 @@ impl OpenOptions {
                     Ok(meta) => {
                         // If metadata can be read, trust it.
                         if meta.primary_len > primary_len {
-                            use fs2::FileExt as _;
                             // Log was truncated for some reason...
                             // (This should be relatively rare)
                             // Fill Log with 0s.
                             let file = fs::OpenOptions::new()
                                 .write(true)
                                 .open(&primary_path)
                                 .context(&primary_path, "cannot open for write")?;
-                            file.allocate(meta.primary_len)
-                                .context(&primary_path, "cannot fallocate")?;
+                            file.set_len(meta.primary_len)
+                                .context(&primary_path, "cannot extend file")?;
                             message += &format!(
                                 "Extended log to {:?} bytes required by meta\n",
                                 meta.primary_len
diff --git a/eden/scm/lib/runlog/BUCK b/eden/scm/lib/runlog/BUCK
@@ -36,7 +36,6 @@ rust_library(
     deps = [
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:chrono",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:parking_lot",
         "fbsource//third-party/rust:rand",
         "fbsource//third-party/rust:serde",
diff --git a/eden/scm/lib/runlog/Cargo.toml b/eden/scm/lib/runlog/Cargo.toml
@@ -15,7 +15,6 @@ name = "runlog"
 [dependencies]
 anyhow = "1.0.98"
 chrono = { version = "0.4.41", features = ["clock", "serde", "std"], default-features = false }
-fs2 = "0.4"
 parking_lot = { version = "0.12.1", features = ["send_guard"] }
 rand = { version = "0.9", features = ["small_rng"] }
 sapling-configmodel = { version = "0.1.0", path = "../config/model" }
diff --git a/eden/scm/lib/runlog/src/filestore.rs b/eden/scm/lib/runlog/src/filestore.rs
@@ -167,7 +167,7 @@ fn remove_file_ignore_missing<P: AsRef<Path>>(path: P) -> io::Result<()> {
 // locked (by running command). Return false if lock file doesn't exist.
 fn is_locked<P: AsRef<Path>>(path: P) -> Result<bool> {
     match fs::File::open(path.as_ref().with_extension(LOCK_EXT)) {
-        Ok(f) => Ok(fs2::FileExt::try_lock_shared(&f).is_err()),
+        Ok(f) => Ok(f.try_lock_shared().is_err()),
         Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(false),
         Err(err) => Err(Error::new(err)),
     }
diff --git a/eden/scm/lib/treestate/BUCK b/eden/scm/lib/treestate/BUCK
@@ -29,7 +29,6 @@ rust_library(
         "fbsource//third-party/rust:bitflags",
         "fbsource//third-party/rust:byteorder",
         "fbsource//third-party/rust:fs-err",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:sha2",
         "fbsource//third-party/rust:thiserror",
         "fbsource//third-party/rust:tracing",
diff --git a/eden/scm/lib/treestate/Cargo.toml b/eden/scm/lib/treestate/Cargo.toml
@@ -17,7 +17,6 @@ anyhow = "1.0.98"
 bitflags = { version = "2.9", features = ["serde", "std"], default-features = false }
 byteorder = "1.5"
 fs-err = { version = "3", features = ["tokio"] }
-fs2 = "0.4"
 sapling-atomicfile = { version = "0.1.0", path = "../atomicfile" }
 sapling-identity = { version = "0.1.0", path = "../identity" }
 sapling-repolock = { version = "0.1.0", path = "../repolock" }
diff --git a/eden/scm/lib/treestate/src/filereadwrite.rs b/eden/scm/lib/treestate/src/filereadwrite.rs
@@ -109,8 +109,8 @@ impl FileLock for FileReaderWriter {
     fn lock_exclusive(&mut self) -> io::Result<()> {
         if self.locked == 0 {
             match self.lock_file.as_mut() {
-                Some(file) => fs2::FileExt::lock_exclusive(file)?,
-                None => fs2::FileExt::lock_exclusive(self.writer.get_mut())?,
+                Some(file) => file.lock()?,
+                None => self.writer.get_mut().lock()?,
             }
         }
         self.locked += 1;
@@ -120,8 +120,8 @@ impl FileLock for FileReaderWriter {
     fn unlock(&mut self) -> io::Result<()> {
         if self.locked == 1 {
             match self.lock_file.as_mut() {
-                Some(file) => fs2::FileExt::unlock(file)?,
-                None => fs2::FileExt::unlock(self.writer.get_mut())?,
+                Some(file) => file.unlock()?,
+                None => self.writer.get_mut().unlock()?,
             }
         }
         if self.locked > 0 {
@@ -193,15 +193,15 @@ impl FileSync for MemReaderWriter {
 impl FileLock for MemReaderWriter {
     fn lock_exclusive(&mut self) -> io::Result<()> {
         if self.locked == 0 {
-            fs2::FileExt::lock_exclusive(&self.lock_file)?;
+            self.lock_file.lock()?;
         }
         self.locked += 1;
         Ok(())
     }
 
     fn unlock(&mut self) -> io::Result<()> {
         if self.locked == 1 {
-            fs2::FileExt::unlock(&self.lock_file)?;
+            self.lock_file.unlock()?;
         }
         if self.locked > 0 {
             self.locked -= 1;
diff --git a/eden/scm/lib/util/BUCK b/eden/scm/lib/util/BUCK
@@ -66,7 +66,6 @@ rust_library(
         "fbsource//third-party/rust:dirs",
         "fbsource//third-party/rust:fn-error-context",
         "fbsource//third-party/rust:fs-err",
-        "fbsource//third-party/rust:fs2",
         "fbsource//third-party/rust:once_cell",
         "fbsource//third-party/rust:rand",
         "fbsource//third-party/rust:shellexpand",
diff --git a/eden/scm/lib/util/Cargo.toml b/eden/scm/lib/util/Cargo.toml
@@ -18,7 +18,6 @@ anyhow = "1.0.98"
 dirs = "6.0"
 fn-error-context = "0.2"
 fs-err = { version = "3", features = ["tokio"] }
-fs2 = "0.4"
 once_cell = "1.21"
 rand = { version = "0.9", features = ["small_rng"] }
 sapling-atomicfile = { version = "0.1.0", path = "../atomicfile" }
diff --git a/eden/scm/lib/util/src/lock.rs b/eden/scm/lib/util/src/lock.rs
@@ -36,14 +36,16 @@ impl PathLock {
     /// Waits for the lock to be freed, if it's currently locked.
     pub fn exclusive<P: AsRef<Path>>(path: P) -> io::Result<Self> {
         let file = open_lockfile(path.as_ref())?;
-        fs2::FileExt::lock_exclusive(file.file())
+        file.file()
+            .lock()
             .path_context("error exclusive locking file", path.as_ref())?;
         Ok(PathLock { file })
     }
 
     pub fn shared<P: AsRef<Path>>(path: P) -> io::Result<Self> {
         let file = open_lockfile(path.as_ref())?;
-        fs2::FileExt::lock_shared(file.file())
+        file.file()
+            .lock_shared()
             .path_context("error shared locking file", path.as_ref())?;
         Ok(PathLock { file })
     }
@@ -53,7 +55,9 @@ impl PathLock {
     }
 
     pub fn unlock(&self) -> io::Result<()> {
-        fs2::FileExt::unlock(self.file.file())
+        self.file
+            .file()
+            .unlock()
             .path_context("error unlocking file", self.file.path())
     }
 
@@ -91,13 +95,13 @@ pub fn open_lockfile<P: AsRef<Path>>(path: P) -> io::Result<File> {
 
 pub fn try_lock_exclusive<P: AsRef<Path>>(path: P) -> io::Result<File> {
     let file = open_lockfile(path.as_ref())?;
-    fs2::FileExt::try_lock_exclusive(file.file())?;
+    file.file().try_lock()?;
     Ok(file)
 }
 
 pub fn try_lock_shared<P: AsRef<Path>>(path: P) -> io::Result<File> {
     let file = open_lockfile(path.as_ref())?;
-    fs2::FileExt::try_lock_shared(file.file())?;
+    file.file().try_lock_shared()?;
     Ok(file)
 }
 
@@ -143,7 +147,7 @@ impl ContentLock {
         let _dir_lock = PathLock::exclusive(&self.dir_lock_path)?;
         let file = match try_lock_exclusive(&self.lock_path) {
             Ok(lock_file) => lock_file,
-            Err(err) if err.kind() == fs2::lock_contended_error().kind() => {
+            Err(err) if err.kind() == io::ErrorKind::WouldBlock => {
                 let contents = fs_err::read(&self.content_path)?;
                 return Err(LockContendedError {
                     path: self.content_path.clone(),
@@ -178,7 +182,7 @@ impl ContentLock {
         let _dir_lock = PathLock::shared(&self.dir_lock_path)?;
         match try_lock_shared(&self.lock_path) {
             Ok(_) => Ok(()),
-            Err(err) if err.kind() == fs2::lock_contended_error().kind() => {
+            Err(err) if err.kind() == io::ErrorKind::WouldBlock => {
                 let contents = fs_err::read(&self.content_path)?;
                 Err(LockContendedError {
                     path: self.content_path.clone(),

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ impl Persist for IndexedLogStore {`
`499`	`499`	`.create(true)`
`500`	`500`	`.open(&path)?`
`501`	`501`	`};`
`502`		`- fs2::FileExt::lock_exclusive(&lock_file)?;`
	`502`	`+ lock_file.lock()?;`
`503`	`503`	`Ok(lock_file)`
`504`	`504`	`}`
`505`	`505`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ impl Persist for IdMap {`
`519`	`519`	`.create(true)`
`520`	`520`	`.open(&path)?`
`521`	`521`	`};`
`522`		`- fs2::FileExt::lock_exclusive(&lock_file)?;`
	`522`	`+ lock_file.lock()?;`
`523`	`523`	`Ok(lock_file)`
`524`	`524`	`}`
`525`	`525`