diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-27 09:10:03 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-27 09:10:03 -0700 |
| commit | cbcca2c770eb079454c67437c01879ea7e30fd38 (patch) | |
| tree | 66d6c3c32231a2877d86543e67d01ebc064dc5da /src/library | |
| parent | 489b38b5356cfa4103d25de7afef2e5ebbe1f873 (diff) | |
| parent | ba542ba60836cd89e89ac1e9efbc46be14d766f3 (diff) | |
| download | scala-cbcca2c770eb079454c67437c01879ea7e30fd38.tar.gz scala-cbcca2c770eb079454c67437c01879ea7e30fd38.tar.bz2 scala-cbcca2c770eb079454c67437c01879ea7e30fd38.zip | |
Merge pull request #787 from axel22/issue/5971
Fix SI-5971.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/IterableViewLike.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/collection/SeqViewLike.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/collection/TraversableViewLike.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/IterableViewLike.scala b/src/library/scala/collection/IterableViewLike.scala index c842475590..e0c8b21d09 100644 --- a/src/library/scala/collection/IterableViewLike.scala +++ b/src/library/scala/collection/IterableViewLike.scala @@ -44,7 +44,7 @@ trait IterableViewLike[+A, } /** Explicit instantiation of the `Transformed` trait to reduce class file size in subclasses. */ - private[collection] abstract class AbstractTransformed[+B] extends super[TraversableViewLike].Transformed[B] with Transformed[B] + private[collection] abstract class AbstractTransformed[+B] extends Iterable[B] with super[TraversableViewLike].Transformed[B] with Transformed[B] trait EmptyView extends Transformed[Nothing] with super[TraversableViewLike].EmptyView with super[GenIterableViewLike].EmptyView diff --git a/src/library/scala/collection/SeqViewLike.scala b/src/library/scala/collection/SeqViewLike.scala index f64045c9f6..73f5dda11c 100644 --- a/src/library/scala/collection/SeqViewLike.scala +++ b/src/library/scala/collection/SeqViewLike.scala @@ -40,7 +40,7 @@ trait SeqViewLike[+A, } /** Explicit instantiation of the `Transformed` trait to reduce class file size in subclasses. */ - private[collection] abstract class AbstractTransformed[+B] extends super[IterableViewLike].AbstractTransformed[B] with Transformed[B] + private[collection] abstract class AbstractTransformed[+B] extends Seq[B] with super[IterableViewLike].Transformed[B] with Transformed[B] trait EmptyView extends Transformed[Nothing] with super[IterableViewLike].EmptyView with super[GenSeqViewLike].EmptyView diff --git a/src/library/scala/collection/TraversableViewLike.scala b/src/library/scala/collection/TraversableViewLike.scala index eb2091a5f3..bf4f8205d6 100644 --- a/src/library/scala/collection/TraversableViewLike.scala +++ b/src/library/scala/collection/TraversableViewLike.scala @@ -117,7 +117,7 @@ trait TraversableViewLike[+A, } /** Explicit instantiation of the `Transformed` trait to reduce class file size in subclasses. */ - private[collection] abstract class AbstractTransformed[+B] extends Transformed[B] + private[collection] abstract class AbstractTransformed[+B] extends Traversable[B] with Transformed[B] trait EmptyView extends Transformed[Nothing] with super.EmptyView |