Skip to content

Use scala.reflect.TypeTest in Reflection #10305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 14, 2020
Merged
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
532 changes: 206 additions & 326 deletions compiler/src/scala/quoted/internal/impl/QuoteContextImpl.scala

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion library/src/scala/quoted/Reflection.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.quoted

import scala.tasty.reflect._
import scala.reflect.TypeTest

/** AST reflection interface.
*
Expand Down
1 change: 0 additions & 1 deletion library/src/scala/quoted/internal/QuoteMatching.scala
Original file line number Diff line number Diff line change
@@ -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 =>
Expand Down
1 change: 0 additions & 1 deletion library/src/scala/quoted/internal/QuoteUnpickler.scala
Original file line number Diff line number Diff line change
@@ -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 =>
Expand Down
9 changes: 0 additions & 9 deletions library/src/scala/tasty/reflect/TypeTest.scala

This file was deleted.

2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion scala3doc/src/dotty/dokka/tasty/ScalaDocSupport.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dotty.dokka.tasty

import scala.jdk.CollectionConverters._
import scala.tasty.reflect._

import org.jetbrains.dokka.model.{doc => dkkd}

Expand Down
2 changes: 0 additions & 2 deletions scala3doc/src/dotty/dokka/tasty/TypesSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion tests/pos-macros/i9240/Macro_1.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import scala.quoted._
import scala.tasty._

inline def diveInto[T]: String = ${ diveIntoImpl[T]() }

Expand Down
1 change: 0 additions & 1 deletion tests/run-macros/tasty-construct-types/Macro_1.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import tasty._
import quoted._

object Macros {
Expand Down