Skip to content

Commit 6369906

Browse files
committed
Add explicit return types to elemTag
1 parent 84a64e0 commit 6369906

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

project/TastyMiMaFilters.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ object TastyMiMaFilters {
3434

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

4039
// Problem: Case class with private constructor

stdlib-bootstrapped/src/scala/collection/immutable/ArraySeq.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
325325

326326
@SerialVersionUID(3L)
327327
final class ofRef[T <: AnyRef](val unsafeArray: Array[T]) extends ArraySeq[T] {
328-
def elemTag = ClassTag[T](unsafeArray.getClass.getComponentType)
328+
def elemTag: ClassTag[T] = ClassTag[T](unsafeArray.getClass.getComponentType)
329329
def length: Int = unsafeArray.length
330330
@throws[ArrayIndexOutOfBoundsException]
331331
def apply(i: Int): T = unsafeArray(i)

stdlib-bootstrapped/src/scala/collection/mutable/ArraySeq.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
139139

140140
@SerialVersionUID(3L)
141141
final class ofRef[T <: AnyRef](val array: Array[T]) extends ArraySeq[T] {
142-
def elemTag = ClassTag[T](array.getClass.getComponentType)
142+
def elemTag: ClassTag[T] = ClassTag[T](array.getClass.getComponentType)
143143
def length: Int = array.length
144144
def apply(index: Int): T = array(index)
145145
def update(index: Int, elem: T): Unit = { array(index) = elem }
@@ -161,7 +161,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
161161

162162
@SerialVersionUID(3L)
163163
final class ofByte(val array: Array[Byte]) extends ArraySeq[Byte] {
164-
def elemTag = ClassTag.Byte
164+
def elemTag: ClassTag.Byte.type = ClassTag.Byte
165165
def length: Int = array.length
166166
def apply(index: Int): Byte = array(index)
167167
def update(index: Int, elem: Byte): Unit = { array(index) = elem }
@@ -180,7 +180,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
180180

181181
@SerialVersionUID(3L)
182182
final class ofShort(val array: Array[Short]) extends ArraySeq[Short] {
183-
def elemTag = ClassTag.Short
183+
def elemTag: ClassTag.Short.type = ClassTag.Short
184184
def length: Int = array.length
185185
def apply(index: Int): Short = array(index)
186186
def update(index: Int, elem: Short): Unit = { array(index) = elem }
@@ -199,7 +199,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
199199

200200
@SerialVersionUID(3L)
201201
final class ofChar(val array: Array[Char]) extends ArraySeq[Char] {
202-
def elemTag = ClassTag.Char
202+
def elemTag: ClassTag.Char.type = ClassTag.Char
203203
def length: Int = array.length
204204
def apply(index: Int): Char = array(index)
205205
def update(index: Int, elem: Char): Unit = { array(index) = elem }
@@ -239,7 +239,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
239239

240240
@SerialVersionUID(3L)
241241
final class ofInt(val array: Array[Int]) extends ArraySeq[Int] {
242-
def elemTag = ClassTag.Int
242+
def elemTag: ClassTag.Int.type = ClassTag.Int
243243
def length: Int = array.length
244244
def apply(index: Int): Int = array(index)
245245
def update(index: Int, elem: Int): Unit = { array(index) = elem }
@@ -258,7 +258,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
258258

259259
@SerialVersionUID(3L)
260260
final class ofLong(val array: Array[Long]) extends ArraySeq[Long] {
261-
def elemTag = ClassTag.Long
261+
def elemTag: ClassTag.Long.type = ClassTag.Long
262262
def length: Int = array.length
263263
def apply(index: Int): Long = array(index)
264264
def update(index: Int, elem: Long): Unit = { array(index) = elem }
@@ -277,7 +277,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
277277

278278
@SerialVersionUID(3L)
279279
final class ofFloat(val array: Array[Float]) extends ArraySeq[Float] {
280-
def elemTag = ClassTag.Float
280+
def elemTag: ClassTag.Float.type = ClassTag.Float
281281
def length: Int = array.length
282282
def apply(index: Int): Float = array(index)
283283
def update(index: Int, elem: Float): Unit = { array(index) = elem }
@@ -296,7 +296,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
296296

297297
@SerialVersionUID(3L)
298298
final class ofDouble(val array: Array[Double]) extends ArraySeq[Double] {
299-
def elemTag = ClassTag.Double
299+
def elemTag: ClassTag.Double.type = ClassTag.Double
300300
def length: Int = array.length
301301
def apply(index: Int): Double = array(index)
302302
def update(index: Int, elem: Double): Unit = { array(index) = elem }
@@ -315,7 +315,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
315315

316316
@SerialVersionUID(3L)
317317
final class ofBoolean(val array: Array[Boolean]) extends ArraySeq[Boolean] {
318-
def elemTag = ClassTag.Boolean
318+
def elemTag: ClassTag.Boolean.type = ClassTag.Boolean
319319
def length: Int = array.length
320320
def apply(index: Int): Boolean = array(index)
321321
def update(index: Int, elem: Boolean): Unit = { array(index) = elem }
@@ -331,7 +331,7 @@ object ArraySeq extends StrictOptimizedClassTagSeqFactory[ArraySeq] { self =>
331331

332332
@SerialVersionUID(3L)
333333
final class ofUnit(val array: Array[Unit]) extends ArraySeq[Unit] {
334-
def elemTag = ClassTag.Unit
334+
def elemTag: ClassTag.Unit.type = ClassTag.Unit
335335
def length: Int = array.length
336336
def apply(index: Int): Unit = array(index)
337337
def update(index: Int, elem: Unit): Unit = { array(index) = elem }

0 commit comments

Comments
 (0)