From d86eceefe7e33e5a52ce58c91ec1c0f28edd06d5 Mon Sep 17 00:00:00 2001 From: CDeltakai Date: Wed, 14 May 2025 15:40:01 +1000 Subject: [PATCH 1/2] fix: removed unreachable conditional branches --- src/RWLockReader.ts | 4 ---- src/RWLockWriter.ts | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/RWLockReader.ts b/src/RWLockReader.ts index 85055af..880f163 100644 --- a/src/RWLockReader.ts +++ b/src/RWLockReader.ts @@ -218,8 +218,6 @@ class RWLockReader implements Lockable { } else { if (typeof params[0] === 'string') { type = params.shift() as 'read' | 'write'; - } else if (typeof params[0] == null) { - params.shift(); } } type = type! ?? 'write'; @@ -268,8 +266,6 @@ class RWLockReader implements Lockable { } else { if (typeof params[0] === 'string') { type = params.shift() as 'read' | 'write'; - } else if (typeof params[0] == null) { - params.shift(); } } type = type! ?? 'write'; diff --git a/src/RWLockWriter.ts b/src/RWLockWriter.ts index c8d965a..d281cc5 100644 --- a/src/RWLockWriter.ts +++ b/src/RWLockWriter.ts @@ -219,8 +219,6 @@ class RWLockWriter implements Lockable { } else { if (typeof params[0] === 'string') { type = params.shift() as 'read' | 'write'; - } else if (typeof params[0] == null) { - params.shift(); } } type = type! ?? 'write'; @@ -269,8 +267,6 @@ class RWLockWriter implements Lockable { } else { if (typeof params[0] === 'string') { type = params.shift() as 'read' | 'write'; - } else if (typeof params[0] == null) { - params.shift(); } } type = type! ?? 'write'; From e5574614b7fdc3dc241226a6cc83865d67eb49d8 Mon Sep 17 00:00:00 2001 From: CDeltakai Date: Wed, 14 May 2025 16:17:19 +1000 Subject: [PATCH 2/2] fix: ensure waitPs.reverse() explicitly discards the returned array with void LockBox and Monitor because we only care about side effects --- src/LockBox.ts | 2 +- src/Monitor.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LockBox.ts b/src/LockBox.ts index f287352..cdf2627 100644 --- a/src/LockBox.ts +++ b/src/LockBox.ts @@ -235,7 +235,7 @@ class LockBox implements Lockable { signal.addEventListener( 'abort', () => { - waitPs.reverse(); + void waitPs.reverse(); for (const waitP of waitPs) { waitP.cancel(signal.reason); } diff --git a/src/Monitor.ts b/src/Monitor.ts index 6d05bbf..2ff2488 100644 --- a/src/Monitor.ts +++ b/src/Monitor.ts @@ -310,7 +310,7 @@ class Monitor implements Lockable { signal.addEventListener( 'abort', () => { - waitPs.reverse(); + void waitPs.reverse(); for (const waitP of waitPs) { waitP.cancel(signal.reason); }