diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-11 11:31:01 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-11 13:34:02 -0800 |
commit | 48f6cdda26d23c563511caaf6842691b2cf5d23e (patch) | |
tree | 99ff558db3fc26957d935ebf1296c093e4bda213 /test/files/pos/t5459.scala | |
parent | 64ad11b49bd7630d596e950953a5b15d3abf1689 (diff) | |
download | scala-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/t5459.scala')
-rw-r--r-- | test/files/pos/t5459.scala | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/test/files/pos/t5459.scala b/test/files/pos/t5459.scala deleted file mode 100644 index 971e6f896d..0000000000 --- a/test/files/pos/t5459.scala +++ /dev/null @@ -1,48 +0,0 @@ -trait A1 -trait A2 -trait A3 -trait L1 extends A1 with A2 with A3 - -object Test { - trait T1[-A <: A1] - trait T2[-A >: L1] - trait T3[ A <: A1] - trait T4[ A >: L1] - trait T5[+A <: A1] - trait T6[+A >: L1] - - def f1(x: T1[_]) = x - def f2(x: T2[_]) = x - def f3(x: T3[_]) = x - def f4(x: T4[_]) = x - def f5(x: T5[_]) = x - def f6(x: T6[_]) = x - // a.scala:22: error: type arguments [Any] do not conform to trait T5's type parameter bounds [+A <: A1] - // def f5(x: T5[_]) = x - // ^ - - def g1(x: T1[_ <: A1]) = x - def g2(x: T2[_ >: L1]) = x - def g3(x: T3[_ <: A1]) = x - def g4(x: T4[_ >: L1]) = x - def g5(x: T5[_ <: A1]) = x - def g6(x: T6[_ >: L1]) = x - - def q1(x: T1[_ >: L1]) = x - def q2(x: T2[_ <: A1]) = x - def q3(x: T3[_ >: L1]) = x - def q4(x: T4[_ <: A1]) = x - def q5(x: T5[_ >: L1]) = x - def q6(x: T6[_ <: A1]) = x - // a.scala:41: error: type arguments [Any] do not conform to trait T5's type parameter bounds [+A <: A1] - // def q5(x: T5[_ >: L1]) = x - // ^ - // two errors found - - def h1(x: T1[_ >: L1 <: A1]) = x - def h2(x: T2[_ >: L1 <: A1]) = x - def h3(x: T3[_ >: L1 <: A1]) = x - def h4(x: T4[_ >: L1 <: A1]) = x - def h5(x: T5[_ >: L1 <: A1]) = x - def h6(x: T6[_ >: L1 <: A1]) = x -} |