Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/scala/lacasa/Actor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ object doNothing {
type Captured = Nothing
type Excluded = box.C
def apply(): Unit = {}
def skipScalaSamConversion: Nothing = ???
}
}

Expand All @@ -29,6 +30,7 @@ object sleep {
def apply(): Unit = {
Thread.sleep(millis)
}
def skipScalaSamConversion: Nothing = ???
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/lacasa/Box.scala
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ sealed class Box[+T] private (private val instance: T) {
* The argument `assign` must have the form `(x, y) => x.f = y`.
*/
def capture[S](consumed: Box[S])(assign: (T, S) => Unit)(
fun: Spore[Packed[T], Unit] /*{ type Excluded = consumed.C }*/)( // TODO: fix spores
fun: Spore[Packed[T], Unit] { type Excluded = consumed.C })( // TODO: fix spores
implicit access: CanAccess { type C = self.C },
accessConsumed: CanAccess { type C = consumed.C }): Nothing = {

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/lacasa/test/CaptureSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.junit.runner.RunWith
import org.junit.runners.JUnit4

import scala.spores._
import scala.spores.SporeConv._
//import scala.spores.SporeConv._

import lacasa.{Box, Packed}
import Box._
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/lacasa/test/actor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import scala.concurrent.{Future, Promise, Await}
import scala.concurrent.duration._

import scala.spores._
import scala.spores.SporeConv._
//import scala.spores.SporeConv._

import lacasa.{System, Box, CanAccess, Actor, ActorRef}
import Box._
Expand Down
2 changes: 1 addition & 1 deletion project/LaCasaBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object LaCasaBuild extends Build {
scalacOptions ++= Seq("-deprecation", "-feature"),
parallelExecution in Test := false,
logBuffered := false,
libraryDependencies += "org.scala-lang.modules" %% "spores-core" % "0.2.4",
libraryDependencies += "ch.epfl.scala" %% "spores" % "0.5.0-SNAPSHOT",
libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _),
scalaHome := {
val scalaHome = System.getProperty("lacasa.scala.home")
Expand Down