aboutsummaryrefslogtreecommitdiff
path: root/tests/pending
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2016-04-16 13:42:41 +0200
committerodersky <odersky@gmail.com>2016-04-16 13:42:41 +0200
commit3ef41153463fbc89a3dda3a648ae0320aef95555 (patch)
treee2ac430f5f0b498fc7b8243c5cda2df6044097cf /tests/pending
parent8af61ab2df46456fb943ce614c4d22b22a297239 (diff)
parent7ea24c63ad57029b8e68ff00f5978e0e9058f60b (diff)
downloaddotty-3ef41153463fbc89a3dda3a648ae0320aef95555.tar.gz
dotty-3ef41153463fbc89a3dda3a648ae0320aef95555.tar.bz2
dotty-3ef41153463fbc89a3dda3a648ae0320aef95555.zip
Merge pull request #1211 from dotty-staging/fix-#1202
Fix Tasty errors
Diffstat (limited to 'tests/pending')
-rw-r--r--tests/pending/pickling/cyclic-annotations.scala1
-rw-r--r--tests/pending/pickling/i94-nada.scala45
2 files changed, 1 insertions, 45 deletions
diff --git a/tests/pending/pickling/cyclic-annotations.scala b/tests/pending/pickling/cyclic-annotations.scala
new file mode 100644
index 000000000..b975afe37
--- /dev/null
+++ b/tests/pending/pickling/cyclic-annotations.scala
@@ -0,0 +1 @@
+@ann class ann extends scala.annotation.Annotation
diff --git a/tests/pending/pickling/i94-nada.scala b/tests/pending/pickling/i94-nada.scala
deleted file mode 100644
index ce8dc98ad..000000000
--- a/tests/pending/pickling/i94-nada.scala
+++ /dev/null
@@ -1,45 +0,0 @@
-package i94
-
-import scala.language.higherKinds
-
-trait Base {
- type Rep[T]
-}
-
-trait BaseExp extends Base {
- type Rep[T] = Exp[T]
- case class Exp[T](v: T)
-}
-
-trait BaseStr extends Base {
- type Rep[T] = String
-}
-
-trait BaseDirect extends Base {
- type Rep[T] = T
-}
-
-trait Test1 {
- trait Monad[X] {
- def x: X
- }
- sealed abstract class Either[A,B]
- case class Left[A,B](x: A) extends Either[A,B] with Monad[A]
- case class Right[A,B](x: B) extends Either[A,B] with Monad[B]
- def flatMap[X,Y,M[X]<:Monad[X]](m: M[X], f: X => M[Y]): M[Y] = f(m.x)
- println(flatMap(Left(1), {x: Int => Left(x)}))
-}
-trait Test2 {
- trait Monad[X] {
- def x: X
- }
- sealed abstract class Either[A,B]
- case class Left[A,B](x: A) extends Either[A,B] with Monad[A]
- case class Right[A,B](x: B) extends Either[A,B] with Monad[B]
- def flatMap[X,Y,M[X]](m: M[X], f: X => M[Y]): M[Y]
- println(flatMap(Left(1), {x: Int => Left(x)}))
-}
-trait Test3 {
- def flatMap[X,Y,M[X]](m: M[X], f: X => M[Y]): M[Y]
- println(flatMap(Some(1), {x: Int => Some(x)}))
-}