diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/S6.check | 2 | ||||
| -rw-r--r-- | test/files/neg/seqtest.check | 3 | ||||
| -rw-r--r-- | test/files/pos/imports.scala | 2 | ||||
| -rw-r--r-- | test/neg/S6.check | 2 | ||||
| -rw-r--r-- | test/neg/seqtest.check | 3 | ||||
| -rw-r--r-- | test/pos/imports.scala | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/test/files/neg/S6.check b/test/files/neg/S6.check index 6303e4c8e2..0647138103 100644 --- a/test/files/neg/S6.check +++ b/test/files/neg/S6.check @@ -1,4 +1,4 @@ -S6.scala:11: illegal cyclic reference involving type S +S6.scala:11: cyclic aliasing or subtyping involving type S type S <: T; ^ one error found diff --git a/test/files/neg/seqtest.check b/test/files/neg/seqtest.check index d3a04e8e51..42d3a71a9c 100644 --- a/test/files/neg/seqtest.check +++ b/test/files/neg/seqtest.check @@ -1,6 +1,7 @@ seqtest.scala:11: ambiguous reference to overloaded definition, both method L: [a](scala.Seq[a])scala.Seq[a] -and method L: [a](a*)scala.Seq[a] match. +and method L: [a](a*)scala.Seq[a] +match argument types (scala.Seq[scala.Int]) val c = L(a); ^ one error found diff --git a/test/files/pos/imports.scala b/test/files/pos/imports.scala index 32b7aace62..65ea090436 100644 --- a/test/files/pos/imports.scala +++ b/test/files/pos/imports.scala @@ -1,7 +1,5 @@ package test; - - import java.lang.{System => S} object test { diff --git a/test/neg/S6.check b/test/neg/S6.check index 6303e4c8e2..0647138103 100644 --- a/test/neg/S6.check +++ b/test/neg/S6.check @@ -1,4 +1,4 @@ -S6.scala:11: illegal cyclic reference involving type S +S6.scala:11: cyclic aliasing or subtyping involving type S type S <: T; ^ one error found diff --git a/test/neg/seqtest.check b/test/neg/seqtest.check index d3a04e8e51..42d3a71a9c 100644 --- a/test/neg/seqtest.check +++ b/test/neg/seqtest.check @@ -1,6 +1,7 @@ seqtest.scala:11: ambiguous reference to overloaded definition, both method L: [a](scala.Seq[a])scala.Seq[a] -and method L: [a](a*)scala.Seq[a] match. +and method L: [a](a*)scala.Seq[a] +match argument types (scala.Seq[scala.Int]) val c = L(a); ^ one error found diff --git a/test/pos/imports.scala b/test/pos/imports.scala index 32b7aace62..65ea090436 100644 --- a/test/pos/imports.scala +++ b/test/pos/imports.scala @@ -1,7 +1,5 @@ package test; - - import java.lang.{System => S} object test { |