From ba495f41a59e092c65b731105f428a3b19355cff Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Sat, 30 Mar 2024 04:12:49 +0800 Subject: [PATCH] Remove redundant crossinline (#4348) Seems we don't need them in newer Kotlin. --- app/src/main/java/com/keylesspalace/tusky/util/Either.kt | 2 +- .../keylesspalace/tusky/viewmodel/AccountsInListViewModel.kt | 2 +- .../java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/Either.kt b/app/src/main/java/com/keylesspalace/tusky/util/Either.kt index 3baf50596..3b26c3daa 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/Either.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/Either.kt @@ -38,7 +38,7 @@ sealed interface Either { fun asRight(): R = (this as Right).value companion object { - inline fun Either.map(crossinline mapper: (R) -> N): Either { + inline fun Either.map(mapper: (R) -> N): Either { return if (this.isLeft()) { Left(this.asLeft()) } else { diff --git a/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountsInListViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountsInListViewModel.kt index 3c5229eb8..5cfb2a31e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountsInListViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountsInListViewModel.kt @@ -118,7 +118,7 @@ class AccountsInListViewModel @Inject constructor(private val api: MastodonApi) } } - private inline fun updateState(crossinline fn: State.() -> State) { + private inline fun updateState(fn: State.() -> State) { _state.value = fn(_state.value) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt index d9fdbd590..4a9a6a484 100644 --- a/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt @@ -143,7 +143,7 @@ internal class ListsViewModel @Inject constructor(private val api: MastodonApi) } } - private inline fun updateState(crossinline fn: State.() -> State) { + private inline fun updateState(fn: State.() -> State) { _state.value = fn(_state.value) }