From 1797f58cb236d954ed6a700b7a6778fc4c4c06aa Mon Sep 17 00:00:00 2001
From: Denis Lochmelis <dlochmelis@gmail.com>
Date: Wed, 8 May 2024 11:00:30 +0200
Subject: [PATCH] Resolve cherry-pick conflicts

---
 .../org/jetbrains/litmuskt/LitmusTest.kt      |  2 +-
 .../kotlin/org/jetbrains/litmuskt/tests/SB.kt | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/core/src/commonMain/kotlin/org/jetbrains/litmuskt/LitmusTest.kt b/core/src/commonMain/kotlin/org/jetbrains/litmuskt/LitmusTest.kt
index aa43b4f..5947809 100644
--- a/core/src/commonMain/kotlin/org/jetbrains/litmuskt/LitmusTest.kt
+++ b/core/src/commonMain/kotlin/org/jetbrains/litmuskt/LitmusTest.kt
@@ -45,5 +45,5 @@ class LitmusTestScope<S : Any>(
     }
 }
 
-fun <S : Any> litmusTest(stateProducer: () -> S, setup: LitmusTestScope<S>.() -> Unit) =
+fun <S : Any> litmusTest(stateProducer: () -> S, setup: LitmusTestScope<S>.() -> Unit): LitmusTest<*> =
     LitmusTestScope(stateProducer).apply(setup).build()
diff --git a/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/SB.kt b/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/SB.kt
index 59cfdf9..02b01f4 100644
--- a/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/SB.kt
+++ b/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/SB.kt
@@ -28,25 +28,6 @@ object SB {
         }
     }
 
-    // a sample of infix syntax
-    val infix = litmusTest {
-        object : LitmusIIOutcome() {
-            var x = 0
-            var y = 0
-        }
-    } thread {
-        x = 1
-        r1 = y
-    } thread {
-        y = 1
-        r2 = x
-    } spec {
-        accept(0, 1)
-        accept(1, 0)
-        accept(1, 1)
-        interesting(0, 0)
-    }
-
     val volatile = litmusTest({
         object : LitmusIIOutcome() {
             @Volatile