From e48dc0aa55ce27f44a18a2a27dd50f5eef7ca0ab Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:09:41 +1100 Subject: [PATCH] Fix other fs-lock method Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- crates/fs-lock/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/fs-lock/src/lib.rs b/crates/fs-lock/src/lib.rs index 5cd81d22..0bf20a96 100644 --- a/crates/fs-lock/src/lib.rs +++ b/crates/fs-lock/src/lib.rs @@ -19,7 +19,7 @@ impl FileLock { /// /// Note that this operation is blocking, and should not be called in async contexts. pub fn new_exclusive(file: File) -> io::Result { - file.lock_exclusive()?; + FileExt::lock_exclusive(&file)?; Ok(Self(file)) } @@ -45,7 +45,7 @@ impl FileLock { /// /// Note that this operation is blocking, and should not be called in async contexts. pub fn new_shared(file: File) -> io::Result { - file.lock_shared()?; + FileExt::lock_shared(&file)?; Ok(Self(file)) } @@ -58,7 +58,7 @@ impl FileLock { /// /// Note that this operation is blocking, and should not be called in async contexts. pub fn new_try_shared(file: File) -> Result)> { - match file.try_lock_shared() { + match FileExt::try_lock_shared(&file) { Ok(()) => Ok(Self(file)), Err(e) if e.raw_os_error() == fs4::lock_contended_error().raw_os_error() => { Err((file, None)) @@ -70,7 +70,7 @@ impl FileLock { impl Drop for FileLock { fn drop(&mut self) { - let _ = self.unlock(); + let _ = FileExt::unlock(&self.0); } }