aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2015-11-09 09:53:27 +0100
committerodersky <odersky@gmail.com>2015-11-09 09:53:27 +0100
commitb3a1626d81385624f1db894a360288b85e8b3585 (patch)
treed796e885f95ba60b2367b619639d9cfd248b025d /tests
parent3d5a2e2987066a1575db2874cf2c4721a1a66de1 (diff)
parent9767782a4766826ef903836609cb34c9bad2df61 (diff)
downloaddotty-b3a1626d81385624f1db894a360288b85e8b3585.tar.gz
dotty-b3a1626d81385624f1db894a360288b85e8b3585.tar.bz2
dotty-b3a1626d81385624f1db894a360288b85e8b3585.zip
Merge pull request #927 from dotty-staging/stdlib-bounds
Drop checking that lower bound is a subtype of upper bound.
Diffstat (limited to 'tests')
-rw-r--r--tests/neg/bounds.scala8
-rw-r--r--tests/pos/bounds.scala7
-rw-r--r--tests/pos/t1279a.scala (renamed from tests/neg/t1279a.scala)0
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/neg/bounds.scala b/tests/neg/bounds.scala
new file mode 100644
index 000000000..8d2cd8259
--- /dev/null
+++ b/tests/neg/bounds.scala
@@ -0,0 +1,8 @@
+object Test {
+ class C[B >: String <: Int](x: B)
+ def g[B >: String <: Int](x: B): Int = x
+ def main(args: Array[String]): Unit = {
+ g("foo")
+ new C("bar")
+ }
+}
diff --git a/tests/pos/bounds.scala b/tests/pos/bounds.scala
index 26bc84a1b..625359f74 100644
--- a/tests/pos/bounds.scala
+++ b/tests/pos/bounds.scala
@@ -9,3 +9,10 @@ object ListMap {
def empty[X, Y] = new ListMap[X, Y]
def apply[A1, B2](elems: Tuple2[A1, B2]*): Map[A1, B2] = empty[A1,B2].++(elems.iterator)
}
+
+class Test[A] {
+
+ def f[B >: A <: AnyRef](x: A): AnyRef = (x: B)
+ def g[B >: String <: Int](x: B): Int = x
+
+}
diff --git a/tests/neg/t1279a.scala b/tests/pos/t1279a.scala
index 6d768d435..6d768d435 100644
--- a/tests/neg/t1279a.scala
+++ b/tests/pos/t1279a.scala