summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/GenIterableView.scala1
-rw-r--r--src/library/scala/collection/GenIterableViewLike.scala1
-rw-r--r--src/library/scala/collection/GenSeqView.scala1
-rw-r--r--src/library/scala/collection/GenSeqViewLike.scala2
-rw-r--r--src/library/scala/collection/GenTraversableView.scala1
-rw-r--r--src/library/scala/collection/GenTraversableViewLike.scala1
-rw-r--r--src/library/scala/collection/parallel/ParIterableLike.scala1
-rw-r--r--src/library/scala/collection/parallel/ParIterableView.scala1
-rw-r--r--src/library/scala/collection/parallel/ParIterableViewLike.scala1
-rw-r--r--src/library/scala/collection/parallel/ParSeqLike.scala1
-rw-r--r--src/library/scala/collection/parallel/ParSeqView.scala2
-rw-r--r--src/library/scala/collection/parallel/ParSeqViewLike.scala1
12 files changed, 13 insertions, 1 deletions
diff --git a/src/library/scala/collection/GenIterableView.scala b/src/library/scala/collection/GenIterableView.scala
index cd052ddf79..d82649eee6 100644
--- a/src/library/scala/collection/GenIterableView.scala
+++ b/src/library/scala/collection/GenIterableView.scala
@@ -9,4 +9,5 @@
package scala
package collection
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenIterableView[+A, +Coll] extends GenIterableViewLike[A, Coll, GenIterableView[A, Coll]] { }
diff --git a/src/library/scala/collection/GenIterableViewLike.scala b/src/library/scala/collection/GenIterableViewLike.scala
index b519e99ae5..ed3e5ae3c4 100644
--- a/src/library/scala/collection/GenIterableViewLike.scala
+++ b/src/library/scala/collection/GenIterableViewLike.scala
@@ -9,6 +9,7 @@
package scala
package collection
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenIterableViewLike[+A,
+Coll,
+This <: GenIterableView[A, Coll] with GenIterableViewLike[A, Coll, This]]
diff --git a/src/library/scala/collection/GenSeqView.scala b/src/library/scala/collection/GenSeqView.scala
index 0a214832ad..283450640d 100644
--- a/src/library/scala/collection/GenSeqView.scala
+++ b/src/library/scala/collection/GenSeqView.scala
@@ -9,4 +9,5 @@
package scala
package collection
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenSeqView[+A, +Coll] extends GenSeqViewLike[A, Coll, GenSeqView[A, Coll]] { }
diff --git a/src/library/scala/collection/GenSeqViewLike.scala b/src/library/scala/collection/GenSeqViewLike.scala
index d3af953f72..d757871a3d 100644
--- a/src/library/scala/collection/GenSeqViewLike.scala
+++ b/src/library/scala/collection/GenSeqViewLike.scala
@@ -11,7 +11,7 @@ package collection
-
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenSeqViewLike[+A,
+Coll,
+This <: GenSeqView[A, Coll] with GenSeqViewLike[A, Coll, This]]
diff --git a/src/library/scala/collection/GenTraversableView.scala b/src/library/scala/collection/GenTraversableView.scala
index 7d9a6e9777..d62ff74084 100644
--- a/src/library/scala/collection/GenTraversableView.scala
+++ b/src/library/scala/collection/GenTraversableView.scala
@@ -9,4 +9,5 @@
package scala
package collection
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenTraversableView[+A, +Coll] extends GenTraversableViewLike[A, Coll, GenTraversableView[A, Coll]] { }
diff --git a/src/library/scala/collection/GenTraversableViewLike.scala b/src/library/scala/collection/GenTraversableViewLike.scala
index dde18a7a32..b04c927634 100644
--- a/src/library/scala/collection/GenTraversableViewLike.scala
+++ b/src/library/scala/collection/GenTraversableViewLike.scala
@@ -13,6 +13,7 @@ package collection
import generic._
import mutable.{ Builder, ArrayBuffer }
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait GenTraversableViewLike[+A,
+Coll,
+This <: GenTraversableView[A, Coll] with GenTraversableViewLike[A, Coll, This]]
diff --git a/src/library/scala/collection/parallel/ParIterableLike.scala b/src/library/scala/collection/parallel/ParIterableLike.scala
index 5ec0238c69..bbe8fce737 100644
--- a/src/library/scala/collection/parallel/ParIterableLike.scala
+++ b/src/library/scala/collection/parallel/ParIterableLike.scala
@@ -841,6 +841,7 @@ self: ParIterableLike[T, Repr, Sequential] =>
tasksupport.executeAndWaitResult(new ToParMap(combinerFactory(cbf), splitter)(ev) mapResult { _.resultWithTaskSupport })
}
+ @deprecated("views over parallel collections will be removed", "2.11.0")
def view = new ParIterableView[T, Repr, Sequential] {
protected lazy val underlying = self.repr
protected[this] def viewIdentifier = ""
diff --git a/src/library/scala/collection/parallel/ParIterableView.scala b/src/library/scala/collection/parallel/ParIterableView.scala
index 6dce19db19..3b0b0013fd 100644
--- a/src/library/scala/collection/parallel/ParIterableView.scala
+++ b/src/library/scala/collection/parallel/ParIterableView.scala
@@ -20,6 +20,7 @@ import scala.collection.generic.CanCombineFrom
*
* @since 2.9
*/
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait ParIterableView[+T, +Coll <: Parallel, +CollSeq]
extends ParIterableViewLike[T, Coll, CollSeq, ParIterableView[T, Coll, CollSeq], IterableView[T, CollSeq]]
with GenIterableView[T, Coll]
diff --git a/src/library/scala/collection/parallel/ParIterableViewLike.scala b/src/library/scala/collection/parallel/ParIterableViewLike.scala
index 5a7a5f5601..02bed6dd80 100644
--- a/src/library/scala/collection/parallel/ParIterableViewLike.scala
+++ b/src/library/scala/collection/parallel/ParIterableViewLike.scala
@@ -36,6 +36,7 @@ import scala.language.implicitConversions
*
* @since 2.9
*/
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait ParIterableViewLike[+T,
+Coll <: Parallel,
+CollSeq,
diff --git a/src/library/scala/collection/parallel/ParSeqLike.scala b/src/library/scala/collection/parallel/ParSeqLike.scala
index 6693e30fcd..33deb84a6f 100644
--- a/src/library/scala/collection/parallel/ParSeqLike.scala
+++ b/src/library/scala/collection/parallel/ParSeqLike.scala
@@ -323,6 +323,7 @@ self =>
override def toSeq = this.asInstanceOf[ParSeq[T]]
+ @deprecated("views over parallel collections will be removed", "2.11.0")
override def view = new ParSeqView[T, Repr, Sequential] {
protected lazy val underlying = self.repr
protected[this] def viewIdentifier = ""
diff --git a/src/library/scala/collection/parallel/ParSeqView.scala b/src/library/scala/collection/parallel/ParSeqView.scala
index b80994514b..5cebfb44f9 100644
--- a/src/library/scala/collection/parallel/ParSeqView.scala
+++ b/src/library/scala/collection/parallel/ParSeqView.scala
@@ -20,10 +20,12 @@ import scala.collection.generic.CanCombineFrom
*
* @since 2.9
*/
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait ParSeqView[+T, +Coll <: Parallel, +CollSeq]
extends ParSeqViewLike[T, Coll, CollSeq, ParSeqView[T, Coll, CollSeq], SeqView[T, CollSeq]]
+@deprecated("views over parallel collections will be removed", "2.11.0")
object ParSeqView {
abstract class NoCombiner[T] extends Combiner[T, Nothing] {
// self: EnvironmentPassingCombiner[T, Nothing] =>
diff --git a/src/library/scala/collection/parallel/ParSeqViewLike.scala b/src/library/scala/collection/parallel/ParSeqViewLike.scala
index 9d30a052de..a348bcf586 100644
--- a/src/library/scala/collection/parallel/ParSeqViewLike.scala
+++ b/src/library/scala/collection/parallel/ParSeqViewLike.scala
@@ -26,6 +26,7 @@ import scala.collection.parallel.immutable.ParRange
*
* @since 2.9
*/
+@deprecated("views over parallel collections will be removed", "2.11.0")
trait ParSeqViewLike[+T,
+Coll <: Parallel,
+CollSeq,