From ab7c2f2196b7a9082a5578f778d4a3c8cebc5c77 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 19 Sep 2023 14:24:45 +0200 Subject: [PATCH] [stdlib] Explicit visibility and return types: builtins --- core/builtins/src/kotlin/Unit.kt | 2 +- generators/builtins/iterators.kt | 2 +- generators/builtins/progressions.kt | 2 +- generators/builtins/ranges.kt | 2 +- generators/builtins/unsignedTypes.kt | 6 +++--- .../src/kotlin/collections/PrimitiveIterators.kt | 16 ++++++++-------- .../stdlib/src/kotlin/ranges/PrimitiveRanges.kt | 6 +++--- .../stdlib/src/kotlin/ranges/Progressions.kt | 6 +++--- libraries/stdlib/src/kotlin/ranges/Ranges.kt | 2 +- libraries/stdlib/unsigned/src/kotlin/UByte.kt | 2 +- libraries/stdlib/unsigned/src/kotlin/UInt.kt | 2 +- .../stdlib/unsigned/src/kotlin/UIntRange.kt | 4 ++-- libraries/stdlib/unsigned/src/kotlin/ULong.kt | 2 +- .../stdlib/unsigned/src/kotlin/ULongRange.kt | 4 ++-- libraries/stdlib/unsigned/src/kotlin/UShort.kt | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/builtins/src/kotlin/Unit.kt b/core/builtins/src/kotlin/Unit.kt index 4835929d904..50045c6e783 100644 --- a/core/builtins/src/kotlin/Unit.kt +++ b/core/builtins/src/kotlin/Unit.kt @@ -20,5 +20,5 @@ package kotlin * The type with only one value: the `Unit` object. This type corresponds to the `void` type in Java. */ public object Unit { - override fun toString() = "kotlin.Unit" + override fun toString(): String = "kotlin.Unit" } diff --git a/generators/builtins/iterators.kt b/generators/builtins/iterators.kt index 7129a2e6644..5b1db9f214e 100644 --- a/generators/builtins/iterators.kt +++ b/generators/builtins/iterators.kt @@ -27,7 +27,7 @@ class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) { val s = kind.capitalized out.println("/** An iterator over a sequence of values of type `$s`. */") out.println("public abstract class ${s}Iterator : Iterator<$s> {" ) - out.println(" override final fun next() = next$s()") + out.println(" final override fun next(): $s = next$s()") out.println() out.println(" /** Returns the next value in the sequence without boxing. */") out.println(" public abstract fun next$s(): $s") diff --git a/generators/builtins/progressions.kt b/generators/builtins/progressions.kt index df422619f4d..5e92f24d9cb 100644 --- a/generators/builtins/progressions.kt +++ b/generators/builtins/progressions.kt @@ -106,7 +106,7 @@ public open class $progression override fun toString(): String = ${"if (step > 0) \"\$first..\$last step \$step\" else \"\$first downTo \$last step \${-step}\""} - companion object { + public companion object { /** * Creates $progression within the specified bounds of a closed range. * diff --git a/generators/builtins/ranges.kt b/generators/builtins/ranges.kt index d57a7739b8e..9f659b16bce 100644 --- a/generators/builtins/ranges.kt +++ b/generators/builtins/ranges.kt @@ -72,7 +72,7 @@ public class $range(start: $t, endInclusive: $t) : ${t}Progression(start, endInc override fun toString(): String = $toString - companion object { + public companion object { /** An empty range of values of type $t. */ public val EMPTY: $range = $range($emptyBounds) } diff --git a/generators/builtins/unsignedTypes.kt b/generators/builtins/unsignedTypes.kt index d9f3f02206a..86382f8b486 100644 --- a/generators/builtins/unsignedTypes.kt +++ b/generators/builtins/unsignedTypes.kt @@ -70,7 +70,7 @@ class UnsignedTypeGenerator(val type: UnsignedType, out: PrintWriter) : BuiltIns out.println("@JvmInline") out.println("public value class $className @kotlin.internal.IntrinsicConstEvaluation @PublishedApi internal constructor(@PublishedApi internal val data: $storageType) : Comparable<$className> {") out.println() - out.println(""" companion object { + out.println(""" public companion object { /** * A constant holding the minimum value an instance of $className can have. */ @@ -599,7 +599,7 @@ public class ${elementType}Range(start: $elementType, endInclusive: $elementType override fun toString(): String = "${'$'}first..${'$'}last" - companion object { + public companion object { /** An empty range of values of type $elementType. */ public val EMPTY: ${elementType}Range = ${elementType}Range($elementType.MAX_VALUE, $elementType.MIN_VALUE) } @@ -655,7 +655,7 @@ internal constructor( override fun toString(): String = if (step > 0) "${'$'}first..${'$'}last step ${'$'}step" else "${'$'}first downTo ${'$'}last step ${'$'}{-step}" - companion object { + public companion object { /** * Creates ${elementType}Progression within the specified bounds of a closed range. diff --git a/libraries/stdlib/src/kotlin/collections/PrimitiveIterators.kt b/libraries/stdlib/src/kotlin/collections/PrimitiveIterators.kt index 7d792190195..c15743e44ab 100644 --- a/libraries/stdlib/src/kotlin/collections/PrimitiveIterators.kt +++ b/libraries/stdlib/src/kotlin/collections/PrimitiveIterators.kt @@ -10,7 +10,7 @@ package kotlin.collections /** An iterator over a sequence of values of type `Byte`. */ public abstract class ByteIterator : Iterator { - override final fun next() = nextByte() + final override fun next(): Byte = nextByte() /** Returns the next value in the sequence without boxing. */ public abstract fun nextByte(): Byte @@ -18,7 +18,7 @@ public abstract class ByteIterator : Iterator { /** An iterator over a sequence of values of type `Char`. */ public abstract class CharIterator : Iterator { - override final fun next() = nextChar() + final override fun next(): Char = nextChar() /** Returns the next value in the sequence without boxing. */ public abstract fun nextChar(): Char @@ -26,7 +26,7 @@ public abstract class CharIterator : Iterator { /** An iterator over a sequence of values of type `Short`. */ public abstract class ShortIterator : Iterator { - override final fun next() = nextShort() + final override fun next(): Short = nextShort() /** Returns the next value in the sequence without boxing. */ public abstract fun nextShort(): Short @@ -34,7 +34,7 @@ public abstract class ShortIterator : Iterator { /** An iterator over a sequence of values of type `Int`. */ public abstract class IntIterator : Iterator { - override final fun next() = nextInt() + final override fun next(): Int = nextInt() /** Returns the next value in the sequence without boxing. */ public abstract fun nextInt(): Int @@ -42,7 +42,7 @@ public abstract class IntIterator : Iterator { /** An iterator over a sequence of values of type `Long`. */ public abstract class LongIterator : Iterator { - override final fun next() = nextLong() + final override fun next(): Long = nextLong() /** Returns the next value in the sequence without boxing. */ public abstract fun nextLong(): Long @@ -50,7 +50,7 @@ public abstract class LongIterator : Iterator { /** An iterator over a sequence of values of type `Float`. */ public abstract class FloatIterator : Iterator { - override final fun next() = nextFloat() + final override fun next(): Float = nextFloat() /** Returns the next value in the sequence without boxing. */ public abstract fun nextFloat(): Float @@ -58,7 +58,7 @@ public abstract class FloatIterator : Iterator { /** An iterator over a sequence of values of type `Double`. */ public abstract class DoubleIterator : Iterator { - override final fun next() = nextDouble() + final override fun next(): Double = nextDouble() /** Returns the next value in the sequence without boxing. */ public abstract fun nextDouble(): Double @@ -66,7 +66,7 @@ public abstract class DoubleIterator : Iterator { /** An iterator over a sequence of values of type `Boolean`. */ public abstract class BooleanIterator : Iterator { - override final fun next() = nextBoolean() + final override fun next(): Boolean = nextBoolean() /** Returns the next value in the sequence without boxing. */ public abstract fun nextBoolean(): Boolean diff --git a/libraries/stdlib/src/kotlin/ranges/PrimitiveRanges.kt b/libraries/stdlib/src/kotlin/ranges/PrimitiveRanges.kt index c125c75372a..d7f3f4832af 100644 --- a/libraries/stdlib/src/kotlin/ranges/PrimitiveRanges.kt +++ b/libraries/stdlib/src/kotlin/ranges/PrimitiveRanges.kt @@ -41,7 +41,7 @@ public class CharRange(start: Char, endInclusive: Char) : CharProgression(start, override fun toString(): String = "$first..$last" - companion object { + public companion object { /** An empty range of values of type Char. */ public val EMPTY: CharRange = CharRange(1.toChar(), 0.toChar()) } @@ -80,7 +80,7 @@ public class IntRange(start: Int, endInclusive: Int) : IntProgression(start, end override fun toString(): String = "$first..$last" - companion object { + public companion object { /** An empty range of values of type Int. */ public val EMPTY: IntRange = IntRange(1, 0) } @@ -119,7 +119,7 @@ public class LongRange(start: Long, endInclusive: Long) : LongProgression(start, override fun toString(): String = "$first..$last" - companion object { + public companion object { /** An empty range of values of type Long. */ public val EMPTY: LongRange = LongRange(1, 0) } diff --git a/libraries/stdlib/src/kotlin/ranges/Progressions.kt b/libraries/stdlib/src/kotlin/ranges/Progressions.kt index 8ba7da188d6..b62c9d8c969 100644 --- a/libraries/stdlib/src/kotlin/ranges/Progressions.kt +++ b/libraries/stdlib/src/kotlin/ranges/Progressions.kt @@ -59,7 +59,7 @@ public open class CharProgression override fun toString(): String = if (step > 0) "$first..$last step $step" else "$first downTo $last step ${-step}" - companion object { + public companion object { /** * Creates CharProgression within the specified bounds of a closed range. * @@ -121,7 +121,7 @@ public open class IntProgression override fun toString(): String = if (step > 0) "$first..$last step $step" else "$first downTo $last step ${-step}" - companion object { + public companion object { /** * Creates IntProgression within the specified bounds of a closed range. * @@ -183,7 +183,7 @@ public open class LongProgression override fun toString(): String = if (step > 0) "$first..$last step $step" else "$first downTo $last step ${-step}" - companion object { + public companion object { /** * Creates LongProgression within the specified bounds of a closed range. * diff --git a/libraries/stdlib/src/kotlin/ranges/Ranges.kt b/libraries/stdlib/src/kotlin/ranges/Ranges.kt index cb3ad36b015..17d1067ba9c 100644 --- a/libraries/stdlib/src/kotlin/ranges/Ranges.kt +++ b/libraries/stdlib/src/kotlin/ranges/Ranges.kt @@ -82,7 +82,7 @@ public interface ClosedFloatingPointRange> : ClosedRange { /** * Compares two values of range domain type and returns true if first is less than or equal to second. */ - fun lessThanOrEquals(a: T, b: T): Boolean + public fun lessThanOrEquals(a: T, b: T): Boolean } diff --git a/libraries/stdlib/unsigned/src/kotlin/UByte.kt b/libraries/stdlib/unsigned/src/kotlin/UByte.kt index bf92c86013f..ee3a009a4c3 100644 --- a/libraries/stdlib/unsigned/src/kotlin/UByte.kt +++ b/libraries/stdlib/unsigned/src/kotlin/UByte.kt @@ -16,7 +16,7 @@ import kotlin.jvm.* @JvmInline public value class UByte @kotlin.internal.IntrinsicConstEvaluation @PublishedApi internal constructor(@PublishedApi internal val data: Byte) : Comparable { - companion object { + public companion object { /** * A constant holding the minimum value an instance of UByte can have. */ diff --git a/libraries/stdlib/unsigned/src/kotlin/UInt.kt b/libraries/stdlib/unsigned/src/kotlin/UInt.kt index 39fafaae638..457dbbf8367 100644 --- a/libraries/stdlib/unsigned/src/kotlin/UInt.kt +++ b/libraries/stdlib/unsigned/src/kotlin/UInt.kt @@ -16,7 +16,7 @@ import kotlin.jvm.* @JvmInline public value class UInt @kotlin.internal.IntrinsicConstEvaluation @PublishedApi internal constructor(@PublishedApi internal val data: Int) : Comparable { - companion object { + public companion object { /** * A constant holding the minimum value an instance of UInt can have. */ diff --git a/libraries/stdlib/unsigned/src/kotlin/UIntRange.kt b/libraries/stdlib/unsigned/src/kotlin/UIntRange.kt index f573121835f..045ad653fe4 100644 --- a/libraries/stdlib/unsigned/src/kotlin/UIntRange.kt +++ b/libraries/stdlib/unsigned/src/kotlin/UIntRange.kt @@ -47,7 +47,7 @@ public class UIntRange(start: UInt, endInclusive: UInt) : UIntProgression(start, override fun toString(): String = "$first..$last" - companion object { + public companion object { /** An empty range of values of type UInt. */ public val EMPTY: UIntRange = UIntRange(UInt.MAX_VALUE, UInt.MIN_VALUE) } @@ -103,7 +103,7 @@ internal constructor( override fun toString(): String = if (step > 0) "$first..$last step $step" else "$first downTo $last step ${-step}" - companion object { + public companion object { /** * Creates UIntProgression within the specified bounds of a closed range. diff --git a/libraries/stdlib/unsigned/src/kotlin/ULong.kt b/libraries/stdlib/unsigned/src/kotlin/ULong.kt index 06df2d5e507..8f8acafd63b 100644 --- a/libraries/stdlib/unsigned/src/kotlin/ULong.kt +++ b/libraries/stdlib/unsigned/src/kotlin/ULong.kt @@ -16,7 +16,7 @@ import kotlin.jvm.* @JvmInline public value class ULong @kotlin.internal.IntrinsicConstEvaluation @PublishedApi internal constructor(@PublishedApi internal val data: Long) : Comparable { - companion object { + public companion object { /** * A constant holding the minimum value an instance of ULong can have. */ diff --git a/libraries/stdlib/unsigned/src/kotlin/ULongRange.kt b/libraries/stdlib/unsigned/src/kotlin/ULongRange.kt index 9b8132f2a29..c86c7bb5184 100644 --- a/libraries/stdlib/unsigned/src/kotlin/ULongRange.kt +++ b/libraries/stdlib/unsigned/src/kotlin/ULongRange.kt @@ -47,7 +47,7 @@ public class ULongRange(start: ULong, endInclusive: ULong) : ULongProgression(st override fun toString(): String = "$first..$last" - companion object { + public companion object { /** An empty range of values of type ULong. */ public val EMPTY: ULongRange = ULongRange(ULong.MAX_VALUE, ULong.MIN_VALUE) } @@ -103,7 +103,7 @@ internal constructor( override fun toString(): String = if (step > 0) "$first..$last step $step" else "$first downTo $last step ${-step}" - companion object { + public companion object { /** * Creates ULongProgression within the specified bounds of a closed range. diff --git a/libraries/stdlib/unsigned/src/kotlin/UShort.kt b/libraries/stdlib/unsigned/src/kotlin/UShort.kt index e63a673bc87..613ffde9f82 100644 --- a/libraries/stdlib/unsigned/src/kotlin/UShort.kt +++ b/libraries/stdlib/unsigned/src/kotlin/UShort.kt @@ -16,7 +16,7 @@ import kotlin.jvm.* @JvmInline public value class UShort @kotlin.internal.IntrinsicConstEvaluation @PublishedApi internal constructor(@PublishedApi internal val data: Short) : Comparable { - companion object { + public companion object { /** * A constant holding the minimum value an instance of UShort can have. */