Resolve cherry-pick conflicts

JetBrains-Research · May 8, 2024 · 1797f58 · 1797f58
1 parent 6f4d4f4
commit 1797f58
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git 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
@@ -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