Swift cleanup: don't capture case values only to ignore them in switch statements

Signed-off-by: Bryan Montz <bryanmontz@me.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Bryan Montz
2023-07-16 08:00:53 -05:00
committed by William Casarin
parent 3d6909bf62
commit 6bf5293701
7 changed files with 28 additions and 28 deletions

View File

@@ -856,7 +856,7 @@ func find_event(state: DamusState, query query_: FindEvent, callback: @escaping
} }
state.pool.unsubscribe(sub_id: subid, to: [relay_id]) state.pool.unsubscribe(sub_id: subid, to: [relay_id])
} }
case .notice(_): case .notice:
break break
} }

View File

@@ -62,11 +62,11 @@ class EventsModel: ObservableObject {
switch nev { switch nev {
case .event(_, let ev): case .event(_, let ev):
handle_event(relay_id: relay_id, ev: ev) handle_event(relay_id: relay_id, ev: ev)
case .notice(_): case .notice:
break break
case .ok: case .ok:
break break
case .eose(_): case .eose:
load_profiles(profiles_subid: profiles_id, relay_id: relay_id, load: .from_events(events), damus_state: state) load_profiles(profiles_subid: profiles_id, relay_id: relay_id, load: .from_events(events), damus_state: state)
} }
} }

View File

@@ -21,7 +21,7 @@ enum NostrResponse: Decodable {
var subid: String? { var subid: String? {
switch self { switch self {
case .ok(_): case .ok:
return nil return nil
case .event(let sub_id, _): case .event(let sub_id, _):
return sub_id return sub_id

View File

@@ -18,7 +18,7 @@ enum WebSocketEvent {
switch self { switch self {
case .connected: case .connected:
return "Connected" return "Connected"
case .message(_): case .message:
return nil // adding this to the RelayLog was too noisy return nil // adding this to the RelayLog was too noisy
case .disconnected(let close_code, let reason): case .disconnected(let close_code, let reason):
return "Disconnected: Close code: \(close_code), reason: \(reason ?? "unknown")" return "Disconnected: Close code: \(close_code), reason: \(reason ?? "unknown")"

View File

@@ -86,7 +86,7 @@ struct CustomImageProcessor: ImageProcessor {
func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? { func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
switch item { switch item {
case .image(_): case .image:
// This case will never run // This case will never run
return DefaultImageProcessor.default.process(item: item, options: options) return DefaultImageProcessor.default.process(item: item, options: options)
case .data(let data): case .data(let data):

View File

@@ -120,13 +120,13 @@ enum Route: Hashable {
return lhs_pubkey == rhs_pubkey return lhs_pubkey == rhs_pubkey
case (.Profile (let lhs_profile, _), .Profile(let rhs_profile, _)): case (.Profile (let lhs_profile, _), .Profile(let rhs_profile, _)):
return lhs_profile == rhs_profile return lhs_profile == rhs_profile
case (.Followers (_), .Followers (_)): case (.Followers, .Followers):
return true return true
case (.Relay (let lhs_relay, _), .Relay (let rhs_relay, _)): case (.Relay (let lhs_relay, _), .Relay (let rhs_relay, _)):
return lhs_relay == rhs_relay return lhs_relay == rhs_relay
case (.RelayDetail(let lhs_relay, _), .RelayDetail(let rhs_relay, _)): case (.RelayDetail(let lhs_relay, _), .RelayDetail(let rhs_relay, _)):
return lhs_relay == rhs_relay return lhs_relay == rhs_relay
case (.Following(_), .Following(_)): case (.Following, .Following):
return true return true
case (.MuteList(let lhs_users), .MuteList(let rhs_users)): case (.MuteList(let lhs_users), .MuteList(let rhs_users)):
return lhs_users == rhs_users return lhs_users == rhs_users
@@ -144,17 +144,17 @@ enum Route: Hashable {
return lhs_relays == rhs_relays return lhs_relays == rhs_relays
case (.KeySettings(let lhs_keypair), .KeySettings(let rhs_keypair)): case (.KeySettings(let lhs_keypair), .KeySettings(let rhs_keypair)):
return lhs_keypair.pubkey == rhs_keypair.pubkey return lhs_keypair.pubkey == rhs_keypair.pubkey
case (.AppearanceSettings(_), .AppearanceSettings(_)): case (.AppearanceSettings, .AppearanceSettings):
return true return true
case (.NotificationSettings(_), .NotificationSettings(_)): case (.NotificationSettings, .NotificationSettings):
return true return true
case (.ZapSettings(_), .ZapSettings(_)): case (.ZapSettings, .ZapSettings):
return true return true
case (.TranslationSettings(_), .TranslationSettings(_)): case (.TranslationSettings, .TranslationSettings):
return true return true
case (.SearchSettings(_), .SearchSettings(_)): case (.SearchSettings, .SearchSettings):
return true return true
case (.DeveloperSettings(_), .DeveloperSettings(_)): case (.DeveloperSettings, .DeveloperSettings):
return true return true
case (.Thread(let lhs_threadModel), .Thread(thread: let rhs_threadModel)): case (.Thread(let lhs_threadModel), .Thread(thread: let rhs_threadModel)):
return lhs_threadModel.event.id == rhs_threadModel.event.id return lhs_threadModel.event.id == rhs_threadModel.event.id
@@ -174,13 +174,13 @@ enum Route: Hashable {
return true return true
case (.SaveKeys(let lhs_account), .SaveKeys(let rhs_account)): case (.SaveKeys(let lhs_account), .SaveKeys(let rhs_account)):
return lhs_account.pubkey == rhs_account.pubkey return lhs_account.pubkey == rhs_account.pubkey
case (.Wallet(_), .Wallet(_)): case (.Wallet, .Wallet):
return true return true
case (.WalletScanner(_), .WalletScanner(_)): case (.WalletScanner, .WalletScanner):
return true return true
case (.FollowersYouKnow(_, _), .FollowersYouKnow(_, _)): case (.FollowersYouKnow, .FollowersYouKnow):
return true return true
case (.Script(_), .Script(_)): case (.Script, .Script):
return true return true
default: default:
return false return false
@@ -195,7 +195,7 @@ enum Route: Hashable {
case .Profile(let profile, _): case .Profile(let profile, _):
hasher.combine("profile") hasher.combine("profile")
hasher.combine(profile.pubkey) hasher.combine(profile.pubkey)
case .Followers(_): case .Followers:
hasher.combine("followers") hasher.combine("followers")
case .Relay(let relay, _): case .Relay(let relay, _):
hasher.combine("relay") hasher.combine("relay")
@@ -203,7 +203,7 @@ enum Route: Hashable {
case .RelayDetail(let relay, _): case .RelayDetail(let relay, _):
hasher.combine("relayDetail") hasher.combine("relayDetail")
hasher.combine(relay) hasher.combine(relay)
case .Following(_): case .Following:
hasher.combine("following") hasher.combine("following")
case .MuteList(let users): case .MuteList(let users):
hasher.combine("muteList") hasher.combine("muteList")
@@ -225,15 +225,15 @@ enum Route: Hashable {
case .KeySettings(let keypair): case .KeySettings(let keypair):
hasher.combine("keySettings") hasher.combine("keySettings")
hasher.combine(keypair.pubkey) hasher.combine(keypair.pubkey)
case .AppearanceSettings(_): case .AppearanceSettings:
hasher.combine("appearanceSettings") hasher.combine("appearanceSettings")
case .NotificationSettings(_): case .NotificationSettings:
hasher.combine("notificationSettings") hasher.combine("notificationSettings")
case .ZapSettings(_): case .ZapSettings:
hasher.combine("zapSettings") hasher.combine("zapSettings")
case .TranslationSettings(_): case .TranslationSettings:
hasher.combine("translationSettings") hasher.combine("translationSettings")
case .SearchSettings(_): case .SearchSettings:
hasher.combine("searchSettings") hasher.combine("searchSettings")
case .DeveloperSettings: case .DeveloperSettings:
hasher.combine("developerSettings") hasher.combine("developerSettings")
@@ -263,9 +263,9 @@ enum Route: Hashable {
case .SaveKeys(let account): case .SaveKeys(let account):
hasher.combine("saveKeys") hasher.combine("saveKeys")
hasher.combine(account.pubkey) hasher.combine(account.pubkey)
case .Wallet(_): case .Wallet:
hasher.combine("wallet") hasher.combine("wallet")
case .WalletScanner(_): case .WalletScanner:
hasher.combine("walletScanner") hasher.combine("walletScanner")
case .FollowersYouKnow(let friendedFollowers, let followers): case .FollowersYouKnow(let friendedFollowers, let followers):
hasher.combine("followersYouKnow") hasher.combine("followersYouKnow")

View File

@@ -68,7 +68,7 @@ class Zaps {
} else { } else {
insert_uniq_sorted_zap_by_amount(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap) insert_uniq_sorted_zap_by_amount(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap)
} }
case .profile(_): case .profile:
break break
} }
} }