summaryrefslogtreecommitdiff
path: root/test/pending
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-06-03 22:12:10 -0700
committerPaul Phillips <paulp@improving.org>2013-06-03 22:12:10 -0700
commitfb06073844f388ec4c007b4c08e7d508fc88d5ab (patch)
tree12062d7a8fce298bc5bbdb7b83fe8c930d18282b /test/pending
parenta04977736c007fc7976c10c7fa5c74ae67902b92 (diff)
parent278305a7f60c46515c2133d11f7c561e972ef705 (diff)
downloadscala-fb06073844f388ec4c007b4c08e7d508fc88d5ab.tar.gz
scala-fb06073844f388ec4c007b4c08e7d508fc88d5ab.tar.bz2
scala-fb06073844f388ec4c007b4c08e7d508fc88d5ab.zip
Merge pull request #2624 from paulp/pr/revert-14534c693d
Revert "SI-7517 type constructors too eagerly normalized."
Diffstat (limited to 'test/pending')
-rw-r--r--test/pending/neg/t2994b.scala8
-rw-r--r--test/pending/pos/lubbing-aliases.scala40
2 files changed, 0 insertions, 48 deletions
diff --git a/test/pending/neg/t2994b.scala b/test/pending/neg/t2994b.scala
deleted file mode 100644
index 20be85eb58..0000000000
--- a/test/pending/neg/t2994b.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-trait curry[s[_]] { type f = Double }
-
-// a1 and a2 fail to compile, but all three should fail.
-class A {
- type a1[s[_ <: Int]] = curry[s]
- type a2[s[_ <: Int]] = curry[s]#f
- type a3[s[_ <: Int]] = Set[curry[s]#f]
-}
diff --git a/test/pending/pos/lubbing-aliases.scala b/test/pending/pos/lubbing-aliases.scala
deleted file mode 100644
index 9c71a4ec91..0000000000
--- a/test/pending/pos/lubbing-aliases.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-trait outer[cc[x], t] {
- type M[x]
- type V
-}
-
-trait Coll[+A]
-trait List[+A] extends Coll[A]
-trait Set[A] extends Coll[A]
-trait Stream[+A] extends Coll[A]
-trait Vector[A] extends Coll[A]
-
-trait Foo[A] {
- type M1[CC[x]] = outer[CC, A]#V
- type M2[CC[x]] = M1[CC]
- type M3[CC[x]] = outer[CC, A]#M[A]
- type M4[CC[x]] = M3[CC]
-
- def f1: M1[List]
- def f2: M2[Set]
- def f3: M3[Stream]
- def f4: M4[Vector]
-
- def g12 = List(f1, f2).head
- def g13 = List(f1, f3).head
- def g14 = List(f1, f4).head
- def g23 = List(f2, f3).head
- def g24 = List(f2, f4).head
- def g34 = List(f3, f4).head
-}
-
-trait Bar extends Foo[Int] {
- class Bippy {
- def g12 = List(f1, f2).head
- def g13 = List(f1, f3).head
- def g14 = List(f1, f4).head
- def g23 = List(f2, f3).head
- def g24 = List(f2, f4).head
- def g34 = List(f3, f4).head
- }
-}