Commit 6b45f991 authored by Him188's avatar Him188

Use `asSequence.joinToString`

parent 85ea4563
...@@ -52,7 +52,7 @@ class ContactList<C : Contact>(@MiraiInternalAPI val delegate: LockFreeLinkedLis ...@@ -52,7 +52,7 @@ class ContactList<C : Contact>(@MiraiInternalAPI val delegate: LockFreeLinkedLis
return null return null
} }
override fun toString(): String = delegate.joinToString(separator = ", ", prefix = "ContactList(", postfix = ")") override fun toString(): String = delegate.asSequence().joinToString(separator = ", ", prefix = "ContactList(", postfix = ")")
} }
operator fun <C : Contact> LockFreeLinkedList<C>.get(id: Long): C { operator fun <C : Contact> LockFreeLinkedList<C>.get(id: Long): C {
......
...@@ -15,18 +15,6 @@ import kotlinx.atomicfu.AtomicRef ...@@ -15,18 +15,6 @@ import kotlinx.atomicfu.AtomicRef
import kotlinx.atomicfu.atomic import kotlinx.atomicfu.atomic
import kotlinx.atomicfu.loop import kotlinx.atomicfu.loop
inline fun <E> LockFreeLinkedList<E>.joinToString(
separator: CharSequence = ", ",
prefix: CharSequence = "[",
postfix: CharSequence = "]",
transform: ((E) -> CharSequence) = { it.toString() }
): String = prefix.toString() + buildString {
this@joinToString.forEach {
append(transform(it))
append(separator)
}
}.dropLast(separator.length) + postfix
/** /**
* Collect all the elements into a [MutableList] then cast it as a [List] * Collect all the elements into a [MutableList] then cast it as a [List]
*/ */
...@@ -215,7 +203,7 @@ open class LockFreeLinkedList<E> { ...@@ -215,7 +203,7 @@ open class LockFreeLinkedList<E> {
internal fun <E> LockFreeLinkedListNode<E>.compareAndSetNextNodeRef(expect: LockFreeLinkedListNode<E>, update: LockFreeLinkedListNode<E>) = internal fun <E> LockFreeLinkedListNode<E>.compareAndSetNextNodeRef(expect: LockFreeLinkedListNode<E>, update: LockFreeLinkedListNode<E>) =
this.nextNodeRef.compareAndSet(expect, update) this.nextNodeRef.compareAndSet(expect, update)
override fun toString(): String = joinToString() override fun toString(): String = asSequence().joinToString()
@Suppress("unused") @Suppress("unused")
internal fun getLinkStructure(): String = buildString { internal fun getLinkStructure(): String = buildString {
...@@ -754,7 +742,7 @@ internal open class Tail<E> : LockFreeLinkedListNode<E>(null, null) { ...@@ -754,7 +742,7 @@ internal open class Tail<E> : LockFreeLinkedListNode<E>(null, null) {
open class LockFreeLinkedListNode<E>( open class LockFreeLinkedListNode<E>(
nextNode: LockFreeLinkedListNode<E>?, nextNode: LockFreeLinkedListNode<E>?,
private var initialNodeValue: E? private val initialNodeValue: E?
) { ) {
/* /*
internal val id: Int = nextId() internal val id: Int = nextId()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment