diff --git a/libraries/stdlib/src/kotlin/Standard.kt b/libraries/stdlib/src/kotlin/Standard.kt index 9d5e3328847..dd388800575 100644 --- a/libraries/stdlib/src/kotlin/Standard.kt +++ b/libraries/stdlib/src/kotlin/Standard.kt @@ -4,7 +4,6 @@ import java.util.ArrayList import java.util.Collection import java.util.HashSet import java.util.LinkedList -import java.util.concurrent.Callable /** Helper to make jet.Iterator usable in for @@ -79,12 +78,3 @@ public inline fun runnable(action: ()-> Unit): Runnable { } } -/** - * A helper method for creating a [[Callable]] from a function - */ -public inline fun callable(action: ()-> T): Callable { - return object: Callable { - public override fun call() = action() - } -} - diff --git a/libraries/stdlib/src/kotlin/StandardJVM.kt b/libraries/stdlib/src/kotlin/StandardJVM.kt index cf436cd2432..6986424b2e8 100644 --- a/libraries/stdlib/src/kotlin/StandardJVM.kt +++ b/libraries/stdlib/src/kotlin/StandardJVM.kt @@ -10,6 +10,7 @@ import java.util.SortedSet import java.util.Comparator import java.io.PrintWriter import java.io.PrintStream +import java.util.concurrent.Callable /** * Add iterated elements to a [[LinkedHashSet]] to preserve insertion order @@ -44,3 +45,12 @@ public inline fun Throwable.printStackTrace(stream: PrintStream): Unit { jlt.printStackTrace(stream) } + +/** + * A helper method for creating a [[Callable]] from a function + */ +public inline fun callable(action: ()-> T): Callable { + return object: Callable { + public override fun call() = action() + } +}