summaryrefslogtreecommitdiff
path: root/test/files/pos/t1786.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-02-11 11:31:01 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-02-11 13:34:02 -0800
commit48f6cdda26d23c563511caaf6842691b2cf5d23e (patch)
tree99ff558db3fc26957d935ebf1296c093e4bda213 /test/files/pos/t1786.scala
parent64ad11b49bd7630d596e950953a5b15d3abf1689 (diff)
downloadscala-48f6cdda26d23c563511caaf6842691b2cf5d23e.tar.gz
scala-48f6cdda26d23c563511caaf6842691b2cf5d23e.tar.bz2
scala-48f6cdda26d23c563511caaf6842691b2cf5d23e.zip
Revert "SI-1786 incorporate defined bounds in inference"
Have to revert because the stricter bounds that it inferred break e.g., slick. (Backstop for that added as pos/t1786-counter.scala, as minimized by Jason) Worse, the fix was compilation order-dependent. There's a less invasive fix (SI-6169) that could be generalized in `sharpenQuantifierBounds` (used in `skolemizeExistential`), but I'd rather not mess with existentials at this point. This reverts commit e28c3edda4dd405ed382227d2a688b799bf33c72. Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala test/files/pos/t1786.scala
Diffstat (limited to 'test/files/pos/t1786.scala')
-rw-r--r--test/files/pos/t1786.scala19
1 files changed, 0 insertions, 19 deletions
diff --git a/test/files/pos/t1786.scala b/test/files/pos/t1786.scala
deleted file mode 100644
index 32d6c06f6e..0000000000
--- a/test/files/pos/t1786.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-class SomeClass(val intValue:Int)
-class MyClass[T <: SomeClass](val myValue:T)
-class Flooz[A >: Null <: SomeClass, T >: Null <: A](var value: T)
-
-class A {
- def f1(i:MyClass[_]) = i.myValue.intValue
- def f2(i:MyClass[_ <: SomeClass]) = i.myValue.intValue
- // def f3[T](i: MyClass[T]) = i.myValue.intValue
- def f4[T <: SomeClass](i: MyClass[T]) = i.myValue.intValue
- // def f5[T >: Null](i: MyClass[T]) = i.myValue.intValue
- // def f6[T >: Null <: String](i: MyClass[T]) = i.myValue.intValue + i.myValue.charAt(0)
-
- // def g1[A, T](x: Flooz[A, T]) = { x.value = null ; x.value.intValue }
- def g2(x: Flooz[_, _]) = { x.value = null ; x.value.intValue }
-
- class MyClass2(x: MyClass[_]) { val p = x.myValue.intValue }
- // class MyClass3[T <: String](x: MyClass[T]) { val p = x.myValue.intValue + x.myValue.length }
- // class MyClass4[T >: Null](x: MyClass[T]) { val p = x.myValue.intValue }
-}