summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-08-09 15:48:15 +0200
committerGitHub <noreply@github.com>2016-08-09 15:48:15 +0200
commita02b913367add3629295c0d3451ebfac586e6181 (patch)
treee26562de0d7ffbf478a0033578736baa4c7d17cd /test
parent2b172be8c83c3146d3fd5ab01546c171ab18fa46 (diff)
parentafc730bb53a9dd44a592d30c222a28dace86c1ea (diff)
downloadscala-a02b913367add3629295c0d3451ebfac586e6181.tar.gz
scala-a02b913367add3629295c0d3451ebfac586e6181.tar.bz2
scala-a02b913367add3629295c0d3451ebfac586e6181.zip
Merge pull request #5302 from soc/topic/deprecation-fixes-2.12
Reduce deprecations and warnings
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/serialization-new.check2
-rw-r--r--test/files/jvm/serialization.check2
-rw-r--r--test/files/neg/t9684.check4
-rw-r--r--test/files/run/array-charSeq.check1
-rw-r--r--test/files/run/bitsets.check2
5 files changed, 6 insertions, 5 deletions
diff --git a/test/files/jvm/serialization-new.check b/test/files/jvm/serialization-new.check
index 5b8a08da82..964c68e528 100644
--- a/test/files/jvm/serialization-new.check
+++ b/test/files/jvm/serialization-new.check
@@ -1,5 +1,5 @@
warning: there were two deprecation warnings (since 2.11.0)
-warning: there was one deprecation warning (since 2.11.6)
+warning: there was one deprecation warning (since 2.12.0)
warning: there were three deprecation warnings in total; re-run with -deprecation for details
a1 = Array[1,2,3]
_a1 = Array[1,2,3]
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index 5b8a08da82..964c68e528 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -1,5 +1,5 @@
warning: there were two deprecation warnings (since 2.11.0)
-warning: there was one deprecation warning (since 2.11.6)
+warning: there was one deprecation warning (since 2.12.0)
warning: there were three deprecation warnings in total; re-run with -deprecation for details
a1 = Array[1,2,3]
_a1 = Array[1,2,3]
diff --git a/test/files/neg/t9684.check b/test/files/neg/t9684.check
index ab36479a47..bb5669733d 100644
--- a/test/files/neg/t9684.check
+++ b/test/files/neg/t9684.check
@@ -1,7 +1,7 @@
-t9684.scala:6: warning: object JavaConversions in package collection is deprecated (since 2.12): Use JavaConverters
+t9684.scala:6: warning: object JavaConversions in package collection is deprecated (since 2.12.0): use JavaConverters
null.asInstanceOf[java.util.List[Int]] : Buffer[Int]
^
-t9684.scala:8: warning: object JavaConversions in package collection is deprecated (since 2.12): Use JavaConverters
+t9684.scala:8: warning: object JavaConversions in package collection is deprecated (since 2.12.0): use JavaConverters
null.asInstanceOf[Iterable[Int]] : java.util.Collection[Int]
^
error: No warnings can be incurred under -Xfatal-warnings.
diff --git a/test/files/run/array-charSeq.check b/test/files/run/array-charSeq.check
index f1f374f63e..3ccf493cee 100644
--- a/test/files/run/array-charSeq.check
+++ b/test/files/run/array-charSeq.check
@@ -1,3 +1,4 @@
+warning: there were two deprecation warnings (since 2.12.0); re-run with -deprecation for details
[check 'abcdefghi'] len = 9
sub(0, 9) == 'abcdefghi'
diff --git a/test/files/run/bitsets.check b/test/files/run/bitsets.check
index 770d9b5e3f..89e51f9a78 100644
--- a/test/files/run/bitsets.check
+++ b/test/files/run/bitsets.check
@@ -1,4 +1,4 @@
-warning: there were three deprecation warnings (since 2.11.6); re-run with -deprecation for details
+warning: there were three deprecation warnings (since 2.12.0); re-run with -deprecation for details
ms0 = BitSet(2)
ms1 = BitSet(2)
ms2 = BitSet(2)