From 1538191c668c5f620e2a799f527d3a2d57c31e5d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 28 Jan 2014 20:20:04 +0400 Subject: [PATCH] Fix variance in Progression and Range --- compiler/testData/builtin-classes.txt | 4 ++-- core/builtins/src/jet/Progression.kt | 2 +- core/builtins/src/jet/Range.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index a5a6a8ec4f6..ade3046217d 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1567,7 +1567,7 @@ public abstract class Number : jet.Hashable { public abstract fun toShort(): jet.Short } -public trait Progression : jet.Iterable { +public trait Progression : jet.Iterable { public abstract val end: N public abstract fun (): N public abstract val increment: jet.Number @@ -1588,7 +1588,7 @@ public final class PropertyMetadataImpl : jet.PropertyMetadata { public open override /*1*/ fun (): jet.String } -public trait Range> { +public trait Range> { public abstract val end: T public abstract fun (): T public abstract val start: T diff --git a/core/builtins/src/jet/Progression.kt b/core/builtins/src/jet/Progression.kt index 7d8327f0d3b..eebf5fbf239 100644 --- a/core/builtins/src/jet/Progression.kt +++ b/core/builtins/src/jet/Progression.kt @@ -16,7 +16,7 @@ package jet -public trait Progression : Iterable { +public trait Progression : Iterable { public val start: N public val end: N diff --git a/core/builtins/src/jet/Range.kt b/core/builtins/src/jet/Range.kt index b1d4907c6e1..27c5c0f42f4 100644 --- a/core/builtins/src/jet/Range.kt +++ b/core/builtins/src/jet/Range.kt @@ -16,7 +16,7 @@ package jet -public trait Range> { +public trait Range> { public val start: T public val end: T