Merge pull request #10305 from dotty-staging/use-type-test-in-reflect

nicolasstucki · web-flow · commit a4ba3bdf123e · 2020-11-14T07:54:44.000+01:00
Use scala.reflect.TypeTest in Reflection
diff --git a/compiler/src/scala/quoted/internal/impl/QuoteContextImpl.scala b/compiler/src/scala/quoted/internal/impl/QuoteContextImpl.scala
diff --git a/library/src/scala/quoted/Reflection.scala b/library/src/scala/quoted/Reflection.scala
@@ -1,6 +1,6 @@
 package scala.quoted
 
-import scala.tasty.reflect._
+import scala.reflect.TypeTest
 
 /** AST reflection interface.
  *
diff --git a/library/src/scala/quoted/internal/QuoteMatching.scala b/library/src/scala/quoted/internal/QuoteMatching.scala
@@ -1,7 +1,6 @@
 package scala.quoted.internal
 
 import scala.quoted.{QuoteContext, Expr, Type}
-import scala.tasty.reflect._
 
 /** Part of the QuoteContext interface that needs to be implemented by the compiler but is not visible to users */
 trait QuoteMatching { self: QuoteContext & QuoteUnpickler =>
diff --git a/library/src/scala/quoted/internal/QuoteUnpickler.scala b/library/src/scala/quoted/internal/QuoteUnpickler.scala
@@ -1,7 +1,6 @@
 package scala.quoted.internal
 
 import scala.quoted.{QuoteContext, Expr, Type}
-import scala.tasty.reflect._
 
 /** Part of the QuoteContext interface that needs to be implemented by the compiler but is not visible to users */
 trait QuoteUnpickler { self: QuoteContext & QuoteMatching =>
diff --git a/library/src/scala/tasty/reflect/TypeTest.scala b/library/src/scala/tasty/reflect/TypeTest.scala
diff --git a/project/Build.scala b/project/Build.scala
@@ -53,7 +53,7 @@ object MyScalaJSPlugin extends AutoPlugin {
 }
 
 object Build {
-  val referenceVersion = "3.0.0-M2-bin-20201108-3938388-NIGHTLY"
+  val referenceVersion = "3.0.0-M2-bin-20201112-462a72f-NIGHTLY"
 
   val baseVersion = "3.0.0-M2"
   val baseSbtDottyVersion = "0.4.7"
diff --git a/scala3doc/src/dotty/dokka/tasty/ScalaDocSupport.scala b/scala3doc/src/dotty/dokka/tasty/ScalaDocSupport.scala
@@ -1,7 +1,6 @@
 package dotty.dokka.tasty
 
 import scala.jdk.CollectionConverters._
-import scala.tasty.reflect._
 
 import org.jetbrains.dokka.model.{doc => dkkd}
 
diff --git a/scala3doc/src/dotty/dokka/tasty/TypesSupport.scala b/scala3doc/src/dotty/dokka/tasty/TypesSupport.scala
@@ -242,8 +242,6 @@ trait TypesSupport:
         }
         inner(sc) ++ texts(" match {\n") ++ casesTexts ++ texts("}")
 
-      case TypeIdent(t) => texts(t)
-
       case ParamRef(TypeLambda(names, _, _), i) => texts(names.apply(i))
 
       case RecursiveType(tp) => inner(tp)
diff --git a/tests/pos-macros/i9240/Macro_1.scala b/tests/pos-macros/i9240/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.tasty._
 
 inline def diveInto[T]: String = ${ diveIntoImpl[T]() }
 
diff --git a/tests/run-macros/tasty-construct-types/Macro_1.scala b/tests/run-macros/tasty-construct-types/Macro_1.scala
@@ -1,4 +1,3 @@
-import tasty._
 import quoted._
 
 object Macros {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package scala.quoted`
`2`	`2`
`3`		`-import scala.tasty.reflect._`
	`3`	`+import scala.reflect.TypeTest`
`4`	`4`
`5`	`5`	`/** AST reflection interface.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ object MyScalaJSPlugin extends AutoPlugin {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`object Build {`
`56`		`- val referenceVersion = "3.0.0-M2-bin-20201108-3938388-NIGHTLY"`
	`56`	`+ val referenceVersion = "3.0.0-M2-bin-20201112-462a72f-NIGHTLY"`
`57`	`57`
`58`	`58`	`val baseVersion = "3.0.0-M2"`
`59`	`59`	`val baseSbtDottyVersion = "0.4.7"`
Original file line number	Diff line number	Diff line change
`@@ -242,8 +242,6 @@ trait TypesSupport:`
`242`	`242`	`}`
`243`	`243`	`inner(sc) ++ texts(" match {\n") ++ casesTexts ++ texts("}")`
`244`	`244`
`245`		`- case TypeIdent(t) => texts(t)`
`246`		`-`
`247`	`245`	`case ParamRef(TypeLambda(names, _, _), i) => texts(names.apply(i))`
`248`	`246`
`249`	`247`	`case RecursiveType(tp) => inner(tp)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import scala.quoted._`
`2`		`-import scala.tasty._`
`3`	`2`
`4`	`3`	`inline def diveInto[T]: String = ${ diveIntoImpl[T]() }`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import tasty._`
`2`	`1`	`import quoted._`
`3`	`2`
`4`	`3`	`object Macros {`