Fix binary compat issues

scala · May 17, 2021 · 43fec8f · 43fec8f
1 parent 53dd32e
commit 43fec8f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -45,11 +45,6 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     def matches(that: scala.quoted.Expr[Any]): Boolean =
       treeMatch(reflect.asTerm(self), reflect.asTerm(that)).nonEmpty
 
-    override def value(using fromExpr: FromExpr[T]): Option[T] =
-      fromExpr.unapply(self)(using QuotesImpl.this)
-
-    override def valueOrError(using FromExpr[T]): T = self.valueOrAbort
-
     def valueOrAbort(using fromExpr: FromExpr[T]): T =
       def reportError =
         val tree = reflect.asTerm(self)

diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -45,7 +45,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      *  Returns `None` if the expression does not represent a value or possibly contains side effects.
      *  Otherwise returns the `Some` of the value.
      */
-    def value(using FromExpr[T]): Option[T]
+    def value(using FromExpr[T]): Option[T] =
+      given Quotes = Quotes.this
+      summon[FromExpr[T]].unapply(self)
 
     /** Return the value of this expression.
      *
@@ -54,7 +56,13 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      */
     // TODO: deprecate in 3.1.0 and remove @experimental from valueOrAbort
     // @deprecated("Use valueOrThrow", "3.1.0")
-    def valueOrError(using FromExpr[T]): T
+    def valueOrError(using FromExpr[T]): T =
+      val fromExpr = summon[FromExpr[T]]
+      def reportError =
+        val msg = s"Expected a known value. \n\nThe value of: ${self.show}\ncould not be extracted using $fromExpr"
+        reflect.report.throwError(msg, self)
+      given Quotes = Quotes.this
+      fromExpr.unapply(self).getOrElse(reportError)
 
     /** Return the value of this expression.
      *

diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala
@@ -5,9 +5,7 @@ import com.typesafe.tools.mima.core.ProblemFilters._
 object MiMaFilters {
   val Library: Seq[ProblemFilter] = Seq(
     // New APIs marked @experimental in 3.0.1
-    exclude[DirectMissingMethodProblem]("scala.quoted.Quotes.value"),
     exclude[DirectMissingMethodProblem]("scala.quoted.Quotes.valueOrAbort"),
-    exclude[DirectMissingMethodProblem]("scala.quoted.Quotes.valueOrError"),
     exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#reportModule.errorAndAbort"),
     exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SymbolMethods.fieldMember"),
     exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SymbolMethods.fieldMembers"),