Skip to content

Commit ce97789

Browse files
committed
Avoid super-calls leading to illegal superaccessors
...in the 2.12 stdlib which is part of our test suite.
1 parent fc7c190 commit ce97789

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tests/scala2-library/src/library/scala/collection/IndexedSeqOptimized.scala

+9-9
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ trait IndexedSeqOptimized[+A, +Repr] extends Any with IndexedSeqLike[A, Repr] {
7070

7171
override /*TraversableLike*/
7272
def reduceLeft[B >: A](op: (B, A) => B): B =
73-
if (length > 0) foldl(1, length, this(0), op) else super.reduceLeft(op)
73+
if (length > 0) foldl(1, length, this(0), op) else super[IndexedSeqLike].reduceLeft(op)
7474

7575
override /*IterableLike*/
7676
def reduceRight[B >: A](op: (A, B) => B): B =
77-
if (length > 0) foldr(0, length - 1, this(length - 1), op) else super.reduceRight(op)
77+
if (length > 0) foldr(0, length - 1, this(length - 1), op) else super[IndexedSeqLike].reduceRight(op)
7878

7979
override /*IterableLike*/
8080
def zip[A1 >: A, B, That](that: GenIterable[B])(implicit bf: CanBuildFrom[Repr, (A1, B), That]): That = that match {
@@ -89,7 +89,7 @@ trait IndexedSeqOptimized[+A, +Repr] extends Any with IndexedSeqLike[A, Repr] {
8989
}
9090
b.result()
9191
case _ =>
92-
super.zip[A1, B, That](that)(bf)
92+
super[IndexedSeqLike].zip[A1, B, That](that)(bf)
9393
}
9494

9595
override /*IterableLike*/
@@ -122,16 +122,16 @@ trait IndexedSeqOptimized[+A, +Repr] extends Any with IndexedSeqLike[A, Repr] {
122122
}
123123

124124
override /*IterableLike*/
125-
def head: A = if (isEmpty) super.head else this(0)
125+
def head: A = if (isEmpty) super[IndexedSeqLike].head else this(0)
126126

127127
override /*TraversableLike*/
128-
def tail: Repr = if (isEmpty) super.tail else slice(1, length)
128+
def tail: Repr = if (isEmpty) super[IndexedSeqLike].tail else slice(1, length)
129129

130130
override /*TraversableLike*/
131-
def last: A = if (length > 0) this(length - 1) else super.last
131+
def last: A = if (length > 0) this(length - 1) else super[IndexedSeqLike].last
132132

133133
override /*IterableLike*/
134-
def init: Repr = if (length > 0) slice(0, length - 1) else super.init
134+
def init: Repr = if (length > 0) slice(0, length - 1) else super[IndexedSeqLike].init
135135

136136
override /*TraversableLike*/
137137
def take(n: Int): Repr = slice(0, n)
@@ -167,7 +167,7 @@ trait IndexedSeqOptimized[+A, +Repr] extends Any with IndexedSeqLike[A, Repr] {
167167
i == len
168168
}
169169
case _ =>
170-
super.sameElements(that)
170+
super[IndexedSeqLike].sameElements(that)
171171
}
172172

173173
override /*IterableLike*/
@@ -274,7 +274,7 @@ trait IndexedSeqOptimized[+A, +Repr] extends Any with IndexedSeqLike[A, Repr] {
274274
true
275275
}
276276
case _ =>
277-
super.endsWith(that)
277+
super[IndexedSeqLike].endsWith(that)
278278
}
279279
}
280280

0 commit comments

Comments
 (0)