Skip to content

Add explicit types to stdlib bootstrapped #18032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Add explicit types to stdlib bootstrapped #18032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8815fb8
Clone scala/reflect/Manifest.scala
nicolasstucki Jun 21, 2023
09c197c
Add explicit types to non-private members of the standard library
nicolasstucki Jun 21, 2023
6e5c132
Clone scala/collection/[im]mutable/ArraySeq.scala
nicolasstucki Jun 21, 2023
4a342e1
Add explicit return types to elemTag
nicolasstucki Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion project/TastyMiMaFilters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ object TastyMiMaFilters {

// Problem: Class[T] or ClassTag[T] with `T` equal to wildcard `_ >: Nothing <: AnyVal` instead of a specific primitive type `T`
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.*.getClass"),
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.reflect.ManifestFactory.*.runtimeClass"),
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.*.elemTag"),
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.mutable.UnrolledBuffer.Unrolled.<init>$default$4"),

Expand Down
18 changes: 9 additions & 9 deletions stdlib-bootstrapped/src/scala/reflect/Manifest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class ByteManifest extends AnyValManifest[scala.Byte]("Byte") {
def runtimeClass = java.lang.Byte.TYPE
def runtimeClass: Class[java.lang.Byte] = java.lang.Byte.TYPE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is annoying because it is not actually correct. The Java signature of Byte.TYPE says it returns a Class<java.lang.Byte>, but it actually returns the class for the primitive type byte. In Scala, that should be typed as Class[scala.Byte] instead.

Since this lives in a private[reflect] class, I suggest we keep ignoring it for now, and instead send a patch upstream to declare it as

Suggested change
def runtimeClass: Class[java.lang.Byte] = java.lang.Byte.TYPE
def runtimeClass: Class[_] = java.lang.Byte.TYPE

The same applies to all the other changes in this file.

@inline override def newArray(len: Int): Array[Byte] = new Array[Byte](len)
override def newWrappedArray(len: Int): ArraySeq[Byte] = new ArraySeq.ofByte(new Array[Byte](len))
override def newArrayBuilder(): ArrayBuilder[Byte] = new ArrayBuilder.ofByte()
Expand All @@ -189,7 +189,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class ShortManifest extends AnyValManifest[scala.Short]("Short") {
def runtimeClass = java.lang.Short.TYPE
def runtimeClass: Class[java.lang.Short] = java.lang.Short.TYPE
@inline override def newArray(len: Int): Array[Short] = new Array[Short](len)
override def newWrappedArray(len: Int): ArraySeq[Short] = new ArraySeq.ofShort(new Array[Short](len))
override def newArrayBuilder(): ArrayBuilder[Short] = new ArrayBuilder.ofShort()
Expand All @@ -205,7 +205,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class CharManifest extends AnyValManifest[scala.Char]("Char") {
def runtimeClass = java.lang.Character.TYPE
def runtimeClass: Class[java.lang.Character] = java.lang.Character.TYPE
@inline override def newArray(len: Int): Array[Char] = new Array[Char](len)
override def newWrappedArray(len: Int): ArraySeq[Char] = new ArraySeq.ofChar(new Array[Char](len))
override def newArrayBuilder(): ArrayBuilder[Char] = new ArrayBuilder.ofChar()
Expand All @@ -221,7 +221,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class IntManifest extends AnyValManifest[scala.Int]("Int") {
def runtimeClass = java.lang.Integer.TYPE
def runtimeClass: Class[java.lang.Integer] = java.lang.Integer.TYPE
@inline override def newArray(len: Int): Array[Int] = new Array[Int](len)
override def newWrappedArray(len: Int): ArraySeq[Int] = new ArraySeq.ofInt(new Array[Int](len))
override def newArrayBuilder(): ArrayBuilder[Int] = new ArrayBuilder.ofInt()
Expand All @@ -237,7 +237,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class LongManifest extends AnyValManifest[scala.Long]("Long") {
def runtimeClass = java.lang.Long.TYPE
def runtimeClass: Class[java.lang.Long] = java.lang.Long.TYPE
@inline override def newArray(len: Int): Array[Long] = new Array[Long](len)
override def newWrappedArray(len: Int): ArraySeq[Long] = new ArraySeq.ofLong(new Array[Long](len))
override def newArrayBuilder(): ArrayBuilder[Long] = new ArrayBuilder.ofLong()
Expand All @@ -253,7 +253,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class FloatManifest extends AnyValManifest[scala.Float]("Float") {
def runtimeClass = java.lang.Float.TYPE
def runtimeClass: Class[java.lang.Float] = java.lang.Float.TYPE
@inline override def newArray(len: Int): Array[Float] = new Array[Float](len)
override def newWrappedArray(len: Int): ArraySeq[Float] = new ArraySeq.ofFloat(new Array[Float](len))
override def newArrayBuilder(): ArrayBuilder[Float] = new ArrayBuilder.ofFloat()
Expand All @@ -269,7 +269,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class DoubleManifest extends AnyValManifest[scala.Double]("Double") {
def runtimeClass = java.lang.Double.TYPE
def runtimeClass: Class[java.lang.Double] = java.lang.Double.TYPE
@inline override def newArray(len: Int): Array[Double] = new Array[Double](len)
override def newWrappedArray(len: Int): ArraySeq[Double] = new ArraySeq.ofDouble(new Array[Double](len))
override def newArrayBuilder(): ArrayBuilder[Double] = new ArrayBuilder.ofDouble()
Expand All @@ -286,7 +286,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class BooleanManifest extends AnyValManifest[scala.Boolean]("Boolean") {
def runtimeClass = java.lang.Boolean.TYPE
def runtimeClass: Class[java.lang.Boolean] = java.lang.Boolean.TYPE
@inline override def newArray(len: Int): Array[Boolean] = new Array[Boolean](len)
override def newWrappedArray(len: Int): ArraySeq[Boolean] = new ArraySeq.ofBoolean(new Array[Boolean](len))
override def newArrayBuilder(): ArrayBuilder[Boolean] = new ArrayBuilder.ofBoolean()
Expand All @@ -302,7 +302,7 @@ object ManifestFactory {

@SerialVersionUID(1L)
final private[reflect] class UnitManifest extends AnyValManifest[scala.Unit]("Unit") {
def runtimeClass = java.lang.Void.TYPE
def runtimeClass: Class[java.lang.Void] = java.lang.Void.TYPE
@inline override def newArray(len: Int): Array[Unit] = new Array[Unit](len)
override def newWrappedArray(len: Int): ArraySeq[Unit] = new ArraySeq.ofUnit(new Array[Unit](len))
override def newArrayBuilder(): ArrayBuilder[Unit] = new ArrayBuilder.ofUnit()
Expand Down