push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,18 @@
diff --git a/src/lock.rs b/src/lock.rs
--- a/src/lock.rs
+++ b/src/lock.rs
@@ -132,10 +132,10 @@ impl ScopedDirLock {
// Lock
match (opts.exclusive, opts.non_blocking) {
- (true, false) => file.lock_exclusive(),
- (true, true) => file.try_lock_exclusive(),
- (false, false) => file.lock_shared(),
- (false, true) => file.try_lock_shared(),
+ (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),
}
.context(&path, || {
format!(