azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inheritance in stdlib contracts code (KT-26409)

Browse Source
This commit is contained in:
victor.petukhov
2018-09-11 14:19:10 +03:00
parent cba99a1e67
commit 50d9dbbfc1
9 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/contracts/Effect.kt
+5 -2
View File
@@ -7,6 +7,9 @@ package kotlin.contracts
import kotlin.internal.ContractsDsl
/**
* Abstract effect, the inheritors of which are used in [ContractBuilder] to describe the contract function.
*/
@ContractsDsl
@ExperimentalContracts
@SinceKotlin("1.3")
@@ -29,7 +32,7 @@ public interface ConditionalEffect : Effect
@ContractsDsl
@ExperimentalContracts
@SinceKotlin("1.3")
public interface SimpleEffect {
public interface SimpleEffect : Effect {
/**
* The function to specify an additional condition for some `SimpleEffect`.
*
@@ -71,4 +74,4 @@ public interface ReturnsNotNull : SimpleEffect
@ContractsDsl
@ExperimentalContracts
@SinceKotlin("1.3")
public interface CallsInPlace : SimpleEffect
public interface CallsInPlace : Effect
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+2 -2
View File
@@ -2570,7 +2570,7 @@ public final class kotlin/concurrent/TimersKt {
public static final fun timer (Ljava/lang/String;Z)Ljava/util/Timer;
}
public abstract interface class kotlin/contracts/CallsInPlace : kotlin/contracts/SimpleEffect {
public abstract interface class kotlin/contracts/CallsInPlace : kotlin/contracts/Effect {
}
public abstract interface class kotlin/contracts/ConditionalEffect : kotlin/contracts/Effect {
@@ -2608,7 +2608,7 @@ public abstract interface class kotlin/contracts/Returns : kotlin/contracts/Simp
public abstract interface class kotlin/contracts/ReturnsNotNull : kotlin/contracts/SimpleEffect {
}
public abstract interface class kotlin/contracts/SimpleEffect {
public abstract interface class kotlin/contracts/SimpleEffect : kotlin/contracts/Effect {
public abstract fun implies (Z)Lkotlin/contracts/ConditionalEffect;
}