aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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: