actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-14 22:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix other fs-lock method

Browse source 
Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
Jiahao XU 2025-02-22 21:09:41 +11:00 • committed by GitHub
parent 158d1d2db0
commit e48dc0aa55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/fs-lock/src/lib.rs
View file

@ -19,7 +19,7 @@ impl FileLock {
/// ///
/// Note that this operation is blocking, and should not be called in async contexts. /// Note that this operation is blocking, and should not be called in async contexts.
pub fn new_exclusive(file: File) -> io::Result<Self> { pub fn new_exclusive(file: File) -> io::Result<Self> {
file.lock_exclusive()?; FileExt::lock_exclusive(&file)?;
Ok(Self(file)) Ok(Self(file))
} }
@ -45,7 +45,7 @@ impl FileLock {
/// ///
/// Note that this operation is blocking, and should not be called in async contexts. /// Note that this operation is blocking, and should not be called in async contexts.
pub fn new_shared(file: File) -> io::Result<Self> { pub fn new_shared(file: File) -> io::Result<Self> {
file.lock_shared()?; FileExt::lock_shared(&file)?;
Ok(Self(file)) Ok(Self(file))
} }
@ -58,7 +58,7 @@ impl FileLock {
/// ///
/// Note that this operation is blocking, and should not be called in async contexts. /// Note that this operation is blocking, and should not be called in async contexts.
pub fn new_try_shared(file: File) -> Result<Self, (File, Option<io::Error>)> { pub fn new_try_shared(file: File) -> Result<Self, (File, Option<io::Error>)> {
match file.try_lock_shared() { match FileExt::try_lock_shared(&file) {
Ok(()) => Ok(Self(file)), Ok(()) => Ok(Self(file)),
Err(e) if e.raw_os_error() == fs4::lock_contended_error().raw_os_error() => { Err(e) if e.raw_os_error() == fs4::lock_contended_error().raw_os_error() => {
Err((file, None)) Err((file, None))
@ -70,7 +70,7 @@ impl FileLock {
impl Drop for FileLock { impl Drop for FileLock {
fn drop(&mut self) { fn drop(&mut self) {
let _ = self.unlock(); let _ = FileExt::unlock(&self.0);
} }
} }