From 560b95c2ece19c622d88b6834e61141e1f77c697 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 7 Jul 2026 21:32:41 +0000 Subject: [PATCH] fix: resolve Kotlin compiler warnings in quartz and quic - Replace unused Unit/null expressions in statement-position when branches with empty blocks (CommandSerializer, QuicConnection, QuicConnectionParser, Http3FrameReader, WtPeerStreamDemux). - Suppress DEPRECATION on KindNames.names, which intentionally registers the deprecated GitReplyEvent and TorrentCommentEvent kinds for display. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_018nqdy4VTLKidUWzGTJPja9 --- .../com/vitorpamplona/quartz/kinds/KindNames.kt | 1 + .../relay/commands/toRelay/CommandSerializer.kt | 4 +--- .../quic/connection/QuicConnection.kt | 14 ++++---------- .../quic/connection/QuicConnectionParser.kt | 4 +--- .../vitorpamplona/quic/http3/Http3FrameReader.kt | 4 +--- .../quic/webtransport/WtPeerStreamDemux.kt | 4 +--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/kinds/KindNames.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/kinds/KindNames.kt index 774dd47b32..f12a7339d7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/kinds/KindNames.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/kinds/KindNames.kt @@ -326,6 +326,7 @@ data class KindName( * platform concern layered on top, never a fork of this data. */ object KindNames { + @Suppress("DEPRECATION") // registry intentionally names deprecated kinds (GitReply, TorrentComment) for display val names: Map = mapOf( AcceptedBadgeSetEvent.KIND to KindName("Accepted Badge Set", "58"), diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandSerializer.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandSerializer.kt index 97e57f0729..3f1a6438b9 100644 --- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandSerializer.kt +++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandSerializer.kt @@ -83,9 +83,7 @@ class CommandSerializer : StdSerializer(Command::class.java) { gen.writeString(cmd.subId) } - else -> { - null - } + else -> {} } gen.writeEndArray() diff --git a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnection.kt b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnection.kt index f57101547a..891869d11e 100644 --- a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnection.kt +++ b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnection.kt @@ -2523,9 +2523,7 @@ class QuicConnection( PathValidator.RecordResult.Stored, PathValidator.RecordResult.Duplicate, PathValidator.RecordResult.AlreadyRetired, - -> { - Unit - } + -> {} PathValidator.RecordResult.PoolFull -> { // Peer over-issued past its own advertised @@ -2573,11 +2571,9 @@ class QuicConnection( // same path before the next outbound packet (which would // otherwise stamp a now-retired CID). when (val rotation = pathValidator.forceRotateToHigherSequence()) { - null -> { - Unit - } - // active CID is still valid; nothing to do. + null -> {} + PathValidator.ForcedRotationResult.NoSpareCid -> { // Watermark forced retirement of the active CID but // the pool is empty — we have nothing valid to use. @@ -2613,9 +2609,7 @@ class QuicConnection( when (val outcome = pathValidator.applyPathResponse(payload)) { PathValidator.ValidationOutcome.NotValidating, PathValidator.ValidationOutcome.PayloadMismatch, - -> { - Unit - } + -> {} is PathValidator.ValidationOutcome.Validated -> { // Bug-7 fix: a valid PATH_RESPONSE proves the peer diff --git a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnectionParser.kt b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnectionParser.kt index e424c274d5..6816ebbd5e 100644 --- a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnectionParser.kt +++ b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/connection/QuicConnectionParser.kt @@ -852,9 +852,7 @@ private fun dispatchFrames( // peer knows it just violated the spec instead of // having its bytes silently dropped. when (stream.receive.insert(frame.offset, frame.data, frame.fin)) { - com.vitorpamplona.quic.stream.ReceiveBuffer.InsertResult.OK -> { - Unit - } + com.vitorpamplona.quic.stream.ReceiveBuffer.InsertResult.OK -> {} com.vitorpamplona.quic.stream.ReceiveBuffer.InsertResult.OFFSET_PAST_FIN -> { conn.markClosedExternally( diff --git a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/http3/Http3FrameReader.kt b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/http3/Http3FrameReader.kt index f00816f0d1..8f27a84503 100644 --- a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/http3/Http3FrameReader.kt +++ b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/http3/Http3FrameReader.kt @@ -165,9 +165,7 @@ class Http3FrameReader( ) } when (context) { - StreamContext.UNCHECKED -> { - Unit - } + StreamContext.UNCHECKED -> {} StreamContext.CONTROL -> { // §7.2.4: SETTINGS MUST be the first frame on the diff --git a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/webtransport/WtPeerStreamDemux.kt b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/webtransport/WtPeerStreamDemux.kt index 345298a8fd..9538fd5f20 100644 --- a/quic/src/commonMain/kotlin/com/vitorpamplona/quic/webtransport/WtPeerStreamDemux.kt +++ b/quic/src/commonMain/kotlin/com/vitorpamplona/quic/webtransport/WtPeerStreamDemux.kt @@ -491,9 +491,7 @@ class WtPeerStreamDemux( } // no new requests; we don't enforce yet - else -> { - Unit - } + else -> {} } } }