Upgrade to Scala 3.0.0-RC1

jodersky · jodersky · commit 7669878eab1c · 2021-03-08T15:53:55.000+01:00
diff --git a/build.sc b/build.sc
@@ -27,7 +27,7 @@ import $file.example.websockets3.build
 import $file.example.websockets4.build
 
 val scala213 = "2.13.4"
-val scala3 = "3.0.0-M3"
+val scala3 = "3.0.0-RC1"
 val dottyCustomVersion = Option(sys.props("dottyVersion"))
 
 trait CaskModule extends CrossScalaModule with PublishModule{
diff --git a/cask/src-3/cask/router/Macros.scala b/cask/src-3/cask/router/Macros.scala
@@ -45,7 +45,7 @@ object Macros {
 
     val idents = method.owner.tree.asInstanceOf[ClassDef].body
     idents.foreach{
-      case deff @ DefDef(Name(idx), _, _, _, tree) =>
+      case deff @ DefDef(Name(idx), _, _, _) =>
         val expr = Ref(deff.symbol).asExpr
         defaults += (params(idx.toInt - 1) -> expr)
       case _ =>
@@ -65,7 +65,7 @@ object Macros {
     val paramTpt = param.tree.asInstanceOf[ValDef].tpt
     val inputReaderTypeRaw = Applied(
       TypeSelect(
-        Term.of(decorator),
+        decorator.asTerm,
         "InputParser"
       ),
       List(paramTpt)
@@ -123,7 +123,7 @@ object Macros {
         val e = '{
           $argss(${Expr(i)})(${Expr(j)}).asInstanceOf[$t]
         }
-        Term.of(e)
+        e.asTerm
       }
     }
 
@@ -150,29 +150,23 @@ object Macros {
   ): Expr[Any] = {
     import qctx.reflect._
 
-    val innerReturnedTpt = TypeSelect(
-      Term.of(endpoint),
-      "InnerReturnedAlias"
-    )
-
-    val rtpt = method.tree.asInstanceOf[DefDef].returnTpt
+    val innerReturnedTpt = endpoint.asTerm.tpe.asType match {
+      case '[Endpoint[_, innerReturned, _]] => TypeRepr.of(using '[innerReturned])
+      case _ => ???
+    }
 
-    val conversionTpeRaw = Applied(
-      TypeTree.of[cask.internal.Conversion],
-      List(
-        rtpt, innerReturnedTpt
-      )
-    ).tpe
+    val rtp = method.tree.asInstanceOf[DefDef].returnTpt.tpe
 
-    // the asInstanceOf is required to splice this back into an Expr; this is generally
-    // unsafe, but we know that it will work in the context that this macro is invoked in
-    val conversionTpe = conversionTpeRaw.asType.asInstanceOf[Type[Any]]
+    val conversionTpe = TypeRepr.of[cask.internal.Conversion].appliedTo(
+      List(rtp, innerReturnedTpt)
+    )
 
-    val conversion = Expr.summon(using conversionTpe) match {
-      case None =>
-        report.error(s"can't convert ${rtpt.tpe.typeSymbol.fullName} to a response", method.pos.get)
+    val conversion = Implicits.search(conversionTpe) match {
+      case iss: ImplicitSearchSuccess =>
+        iss.tree.asExpr
+      case isf: ImplicitSearchFailure =>
+        report.error(s"can't convert ${rtp.typeSymbol.fullName} to a response", method.pos.get)
         '{???}
-      case Some(expr) => expr
     }
 
     '{
@@ -228,7 +222,7 @@ object Macros {
         val decoTpe = (decorator match {
           case Some(deco) =>
             TypeSelect(
-              Term.of(deco),
+              deco.asTerm,
               "InputTypeAlias"
             ).tpe.asType
           case None =>
diff --git a/cask/src/cask/router/Decorators.scala b/cask/src/cask/router/Decorators.scala
@@ -81,9 +81,6 @@ trait RawDecorator extends Decorator[Response.Raw, Response.Raw, Any]{
 trait Endpoint[OuterReturned, InnerReturned, Input]
   extends Decorator[OuterReturned, InnerReturned, Input]{
 
-  // used internally to facilitate access to the type in macros
-  type InnerReturnedAlias = InnerReturned
-
   /**
     * What is the path that this particular endpoint matches?
     */
diff --git a/example/compress/build.sc b/example/compress/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/compress2/build.sc b/example/compress2/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/compress3/build.sc b/example/compress3/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/cookies/build.sc b/example/cookies/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/decorated/build.sc b/example/decorated/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5"
     )
   }
diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc
@@ -11,7 +11,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc
@@ -11,7 +11,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
 
diff --git a/example/staticFiles2/build.sc b/example/staticFiles2/build.sc
@@ -11,7 +11,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
 
diff --git a/example/todo/build.sc b/example/todo/build.sc
@@ -13,7 +13,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc
@@ -12,7 +12,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/twirl/build.sc b/example/twirl/build.sc
@@ -15,7 +15,7 @@ trait AppModule extends CrossScalaModule with mill.twirllib.TwirlModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
     )
   }
diff --git a/example/websockets/build.sc b/example/websockets/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
diff --git a/example/websockets2/build.sc b/example/websockets2/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
diff --git a/example/websockets3/build.sc b/example/websockets3/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
diff --git a/example/websockets4/build.sc b/example/websockets4/build.sc
@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::utest::0.7.7",
       ivy"com.lihaoyi::requests::0.6.5",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
diff --git a/mill b/mill
@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.9.4
+DEFAULT_MILL_VERSION=0.9.5-48-4ad87f
 
 
 set -e

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ trait AppModule extends CrossScalaModule{`
`10`	`10`	`def testFrameworks = Seq("utest.runner.Framework")`
`11`	`11`
`12`	`12`	`def ivyDeps = Agg(`
`13`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`13`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`14`	`14`	`ivy"com.lihaoyi::requests::0.6.5",`
`15`	`15`	`)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ trait AppModule extends CrossScalaModule{`
`9`	`9`	`def testFrameworks = Seq("utest.runner.Framework")`
`10`	`10`
`11`	`11`	`def ivyDeps = Agg(`
`12`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`12`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`13`	`13`	`ivy"com.lihaoyi::requests::0.6.5",`
`14`	`14`	`)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ trait AppModule extends CrossScalaModule{`
`11`	`11`	`def testFrameworks = Seq("utest.runner.Framework")`
`12`	`12`
`13`	`13`	`def ivyDeps = Agg(`
`14`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`14`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`15`	`15`	`ivy"com.lihaoyi::requests::0.6.5",`
`16`	`16`	`)`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ trait AppModule extends CrossScalaModule{`
`13`	`13`	`def testFrameworks = Seq("utest.runner.Framework")`
`14`	`14`
`15`	`15`	`def ivyDeps = Agg(`
`16`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`16`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`17`	`17`	`ivy"com.lihaoyi::requests::0.6.5",`
`18`	`18`	`)`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ trait AppModule extends CrossScalaModule{`
`12`	`12`	`def testFrameworks = Seq("utest.runner.Framework")`
`13`	`13`
`14`	`14`	`def ivyDeps = Agg(`
`15`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`15`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`16`	`16`	`ivy"com.lihaoyi::requests::0.6.5",`
`17`	`17`	`)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ trait AppModule extends CrossScalaModule with mill.twirllib.TwirlModule{`
`15`	`15`	`def testFrameworks = Seq("utest.runner.Framework")`
`16`	`16`
`17`	`17`	`def ivyDeps = Agg(`
`18`		`- ivy"com.lihaoyi::utest::0.7.5",`
	`18`	`+ ivy"com.lihaoyi::utest::0.7.7",`
`19`	`19`	`ivy"com.lihaoyi::requests::0.6.5",`
`20`	`20`	`)`
`21`	`21`	`}`