Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Commit afe0151

Browse files
committed
Avoid deprecation/feature warnings
This commit adds -deprecation and -feature to scalacOptions and fix source code to avoid deprecation/feature warnings. Since #8 is already working on the usages of deprecated CompilationUnit, this commit does not fix them.
1 parent c71ac91 commit afe0151

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ lazy val commonSettings = scalaModuleSettings ++ Seq(
99
organization := "org.scala-lang.plugins",
1010
version := "1.0.1-SNAPSHOT",
1111
scalaVersion := "2.11.2",
12-
snapshotScalaBinaryVersion := "2.11.2"
12+
snapshotScalaBinaryVersion := "2.11.2",
13+
scalacOptions ++= Seq(
14+
"-deprecation",
15+
"-feature")
1316
)
1417

1518
lazy val root = project.in( file(".") ).settings( publishArtifact := false ).aggregate(plugin, library).settings(commonSettings : _*)

library/src/test/scala/scala/tools/selectivecps/TestSuite.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.junit.Assert.assertEquals
66
import scala.annotation._
77
import scala.collection.Seq
88
import scala.collection.generic.CanBuildFrom
9-
import scala.language.{ implicitConversions }
9+
import scala.language.{ implicitConversions, higherKinds }
1010
import scala.util.continuations._
1111
import scala.util.control.Exception
1212

@@ -403,9 +403,9 @@ class Suspendable {
403403
def test4[A](x: List[A]): A @suspendable = x match { case List(x) => x }
404404

405405
@Test def t1821 {
406-
assertEquals((), reset(test1()))
406+
assertEquals((), reset(test1(())))
407407
assertEquals((), reset(test2(List(()))))
408-
assertEquals((), reset(test3()))
408+
assertEquals((), reset(test3(())))
409409
assertEquals((), reset(test4(List(()))))
410410
}
411411
}
@@ -716,12 +716,12 @@ class HigherOrder {
716716
reset {
717717
f(element)
718718
if (super.decrementAndGet() == 0) {
719-
continue()
719+
continue(())
720720
}
721721
}
722722
}
723723
if (super.decrementAndGet() == 0) {
724-
continue()
724+
continue(())
725725
}
726726
}
727727
})

plugin/src/main/scala/scala/tools/selectivecps/CPSUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait CPSUtils {
3535
lazy val MarkerCPSAdaptMinus = rootMirror.getRequiredClass("scala.util.continuations.cpsMinus")
3636

3737
lazy val Context = rootMirror.getRequiredClass("scala.util.continuations.ControlContext")
38-
lazy val ModCPS = rootMirror.getPackage("scala.util.continuations")
38+
lazy val ModCPS = rootMirror.getPackage(TermName("scala.util.continuations"))
3939

4040
lazy val MethShiftUnit = definitions.getMember(ModCPS, cpsNames.shiftUnit)
4141
lazy val MethShiftUnit0 = definitions.getMember(ModCPS, cpsNames.shiftUnit0)

0 commit comments

Comments
 (0)