summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-11-12 11:49:38 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-11-12 11:49:38 -0800
commit3dc269060b370b1e49b54241e31b811208a57153 (patch)
treeffdaa71f36c8d50e89de724963de583ac83598b6
parent2218497e4839a02224ff758a60acf8a730713806 (diff)
parentd6e759165e57a9d920e7008774a81e190be7edde (diff)
downloadscala-3dc269060b370b1e49b54241e31b811208a57153.tar.gz
scala-3dc269060b370b1e49b54241e31b811208a57153.tar.bz2
scala-3dc269060b370b1e49b54241e31b811208a57153.zip
Merge pull request #4804 from jvican/issue/9503
[SI-9503] Deprecate scala.collection.immutable.PagedSeq
-rw-r--r--src/library/scala/collection/immutable/PagedSeq.scala3
-rw-r--r--test/files/run/t3647.check1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala
index a86d4b6746..982c10687c 100644
--- a/src/library/scala/collection/immutable/PagedSeq.scala
+++ b/src/library/scala/collection/immutable/PagedSeq.scala
@@ -23,6 +23,7 @@ import scala.reflect.ClassTag
* `fromIterator` and `fromIterable` provide generalised instances of `PagedSeq`
* @since 2.7
*/
+@deprecated("This object will be moved to the scala-parser-combinators module", "2.11.8")
object PagedSeq {
final val UndeterminedEnd = Int.MaxValue
@@ -126,7 +127,7 @@ import PagedSeq._
* @define mayNotTerminateInf
* @define willNotTerminateInf
*/
-@deprecatedInheritance("The implementation details of paged sequences make inheriting from them unwise.", "2.11.0")
+@deprecated("This class will be moved to the scala-parser-combinators module", "2.11.8")
class PagedSeq[T: ClassTag] protected(
more: (Array[T], Int, Int) => Int,
first1: Page[T],
diff --git a/test/files/run/t3647.check b/test/files/run/t3647.check
new file mode 100644
index 0000000000..e5c1ee1701
--- /dev/null
+++ b/test/files/run/t3647.check
@@ -0,0 +1 @@
+warning: there were three deprecation warnings; re-run with -deprecation for details