migrate to Swift 5.9

.swift-version

@@ -1 +1 @@
-5.8
+5.9

iLepra/Extras/View+HTML.swift

@@ -101,8 +101,7 @@ extension Element {
  .toView()
  .eraseToAny()
  case "span":
- let color: Color
- switch try className() {
+ let color = switch try className() {
  case "moderator":
  color = .blue
  case "irony":

iLepra/LepraContentView.swift

@@ -49,23 +49,23 @@ struct LepraContentView: View {
  private func view(for tab: LepraTab) -> some View {
  switch tab {
  case .feed:
- return LepraFeedView(navigationPath: $navigationPathFeed, shouldReload: $shouldReloadFeed)
+ LepraFeedView(navigationPath: $navigationPathFeed, shouldReload: $shouldReloadFeed)
  .environmentObject(feedViewModel)
  .navigationTitle(tab.title)
  .eraseToAny()
  case .moar:
- return LepraMoarView(navigationPath: $navigationPathMoar, shouldReload: $shouldReloadMoar)
+ LepraMoarView(navigationPath: $navigationPathMoar, shouldReload: $shouldReloadMoar)
  .environmentObject(moarViewModel)
  .navigationTitle(tab.title)
  .badge(moarViewModel.unreadCount)
  .eraseToAny()
  case .domains:
- return LepraDomainsView(navigationPath: $navigationPathDomains, shouldReload: $shouldReloadDomains)
+ LepraDomainsView(navigationPath: $navigationPathDomains, shouldReload: $shouldReloadDomains)
  .environmentObject(domainsViewModel)
  .navigationTitle(tab.title)
  .eraseToAny()
  case .profile:
- return LepraProfileView(shouldReload: $shouldReloadProfile)
+ LepraProfileView(shouldReload: $shouldReloadProfile)
  .environmentObject(profileViewModel)
  .navigationTitle(tab.title)
  .eraseToAny()

iLepra/Screens/VotesDetails/LepraVotesDetailsViewModel.swift

@@ -69,9 +69,8 @@ final class LepraVotesDetailsViewModel: ObservableObject {
  ]
  )
 
- let result: AjaxVotes
- if let votes {
- result = .init(
+ let result: AjaxVotes = if let votes {
+ .init(
  cons: .init((votes.cons + response.cons).uniqued()),
  consCount: response.consCount,
  karma: response.karma,
@@ -83,7 +82,7 @@ final class LepraVotesDetailsViewModel: ObservableObject {
  totalCount: response.totalCount
  )
  } else {
- result = response
+ response
  }
  await MainActor.run {
  votes = result

iLepra/Views/LepraTabView.swift

@@ -18,26 +18,26 @@ enum LepraTab: Hashable, CaseIterable {
  var title: String {
  switch self {
  case .feed:
- return "Главная"
+ "Главная"
  case .moar:
- return "Мои вещи"
+ "Мои вещи"
  case .domains:
- return "Подлепры"
+ "Подлепры"
  case .profile:
- return "Профиль"
+ "Профиль"
  }
  }
 
  var imageName: String {
  switch self {
  case .feed:
- return "house"
+ "house"
  case .moar:
- return "bookmark"
+ "bookmark"
  case .domains:
- return "list.dash"
+ "list.dash"
  case .profile:
- return "brain.head.profile"
+ "brain.head.profile"
  }
  }
 }
@@ -107,13 +107,13 @@ struct LepraTabView<LepraView: View>: View {
  private func view(for tab: LepraTab) -> some View {
  switch tab {
  case .feed:
- return feedView
+ feedView
  case .moar:
- return moarView
+ moarView
  case .domains:
- return domainsView
+ domainsView
  case .profile:
- return profileView
+ profileView
  }
  }
 }