diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-02-27 11:46:19 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-02-28 19:34:42 +0100 |
| commit | 42fd456acf5535a0ec980d207db8cc9e6abc6110 (patch) | |
| tree | 4ac8900649bc2d1e7c6b1b0b804aeda12d3ed796 /tests | |
| parent | 860fd56990d0e6e24a404c5054e5821b18f7870f (diff) | |
| download | dotty-42fd456acf5535a0ec980d207db8cc9e6abc6110.tar.gz dotty-42fd456acf5535a0ec980d207db8cc9e6abc6110.tar.bz2 dotty-42fd456acf5535a0ec980d207db8cc9e6abc6110.zip | |
Re-instantiate depmeth tests
These now compile with the changes to dependent methods, except
for one which is invalid under dotty.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/disabled/pos/depmet_implicit_oopsla_session_simpler.scala (renamed from tests/pending/pos/depmet_implicit_oopsla_session_simpler.scala) | 3 | ||||
| -rw-r--r-- | tests/pos/depmet_implicit_norm_ret.scala (renamed from tests/pending/pos/depmet_implicit_norm_ret.scala) | 0 | ||||
| -rw-r--r-- | tests/pos/depmet_implicit_oopsla_session.scala (renamed from tests/pending/pos/depmet_implicit_oopsla_session.scala) | 0 | ||||
| -rw-r--r-- | tests/pos/depmet_implicit_oopsla_session_2.scala (renamed from tests/pending/pos/depmet_implicit_oopsla_session_2.scala) | 3 |
4 files changed, 3 insertions, 3 deletions
diff --git a/tests/pending/pos/depmet_implicit_oopsla_session_simpler.scala b/tests/disabled/pos/depmet_implicit_oopsla_session_simpler.scala index fad5eba40..8cc6fe754 100644 --- a/tests/pending/pos/depmet_implicit_oopsla_session_simpler.scala +++ b/tests/disabled/pos/depmet_implicit_oopsla_session_simpler.scala @@ -1,3 +1,4 @@ +// Disabled because we now get an unsafe instantiation error object Sessions { trait Session { type Dual <: Session @@ -40,5 +41,5 @@ object Sessions { In{z: Int => System.out.println(z) Stop()}})) - def myRun = addServer run addClient + def myRun = addServer run addClient // error: unsafe instantiation } diff --git a/tests/pending/pos/depmet_implicit_norm_ret.scala b/tests/pos/depmet_implicit_norm_ret.scala index 42bfb9fe1..42bfb9fe1 100644 --- a/tests/pending/pos/depmet_implicit_norm_ret.scala +++ b/tests/pos/depmet_implicit_norm_ret.scala diff --git a/tests/pending/pos/depmet_implicit_oopsla_session.scala b/tests/pos/depmet_implicit_oopsla_session.scala index a9c8e56ce..a9c8e56ce 100644 --- a/tests/pending/pos/depmet_implicit_oopsla_session.scala +++ b/tests/pos/depmet_implicit_oopsla_session.scala diff --git a/tests/pending/pos/depmet_implicit_oopsla_session_2.scala b/tests/pos/depmet_implicit_oopsla_session_2.scala index 29a76d5cf..fcf18691a 100644 --- a/tests/pending/pos/depmet_implicit_oopsla_session_2.scala +++ b/tests/pos/depmet_implicit_oopsla_session_2.scala @@ -1,5 +1,4 @@ object Sessions { - def ?[T <: AnyRef](implicit w: T): w.type = w // session states sealed case class Stop() @@ -18,7 +17,7 @@ object Sessions { // friendly interface to the theory def runSession[S, D: Session[S]#HasDual](session: S, dual: D) = - ?[Session[S]#HasDual[D]].run(session, dual) + implicitly[Session[S]#HasDual[D]].run(session, dual) // facts in the theory: |