diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index 106bd62b19da..d43450c5e281 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit 106bd62b19da4faf405dfe442c1b81ebb5632a87 +Subproject commit d43450c5e2815aa8a697a999df80e7af5b4d8bdd diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits index 95e79563af53..cb5cd936db1d 160000 --- a/community-build/community-projects/scodec-bits +++ b/community-build/community-projects/scodec-bits @@ -1 +1 @@ -Subproject commit 95e79563af532f50e70eaed2d67f2a4d59a4890d +Subproject commit cb5cd936db1dcd55a554ed7f270a046307fa70fd diff --git a/library/src-bootstrapped/scala/quoted/QuoteContext.scala b/library/src-bootstrapped/scala/quoted/QuoteContext.scala index b87f6d5d3c74..5c0b0f08cf5d 100644 --- a/library/src-bootstrapped/scala/quoted/QuoteContext.scala +++ b/library/src-bootstrapped/scala/quoted/QuoteContext.scala @@ -35,9 +35,3 @@ trait QuoteContext { self => } } - -object QuoteContext { - // TODO remove in 0.26.0 - @deprecated("Errors and warnings have been moved to scala.quoted.Reporting", "0.25.0") - given error_and_warining_on_QuoteContext as Conversion[QuoteContext, Reporting.type] = _ => Reporting -} diff --git a/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala b/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala index 839e556a7c2f..c24bf5e9339a 100644 --- a/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala +++ b/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala @@ -3,14 +3,14 @@ import scala.util.FromDigits import scala.quoted._ object BigFloatFromDigitsImpl: - def apply(digits: Expr[String])(using ctx: QuoteContext): Expr[BigFloat] = + def apply(digits: Expr[String])(using QuoteContext): Expr[BigFloat] = digits match case Const(ds) => try val BigFloat(m, e) = BigFloat(ds) '{BigFloat(${Expr(m)}, ${Expr(e)})} catch case ex: FromDigits.FromDigitsException => - ctx.error(ex.getMessage) + Reporting.error(ex.getMessage) '{BigFloat(0, 0)} case digits => '{BigFloat($digits)} diff --git a/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala b/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala index 6733abc99a62..5a54476dc756 100644 --- a/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala +++ b/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala @@ -3,13 +3,13 @@ import scala.quoted._ import Even._ object EvenFromDigitsImpl: - def apply(digits: Expr[String])(using ctx: QuoteContext): Expr[Even] = digits match { + def apply(digits: Expr[String])(using QuoteContext): Expr[Even] = digits match { case Const(ds) => val ev = try evenFromDigits(ds) catch { case ex: FromDigits.FromDigitsException => - ctx.error(ex.getMessage) + Reporting.error(ex.getMessage) Even(0) } '{Even(${Expr(ev.n)})} diff --git a/tests/neg-macros/i9014/Macros_1.scala b/tests/neg-macros/i9014/Macros_1.scala index eec8af992b1c..f14bbe9c98a6 100644 --- a/tests/neg-macros/i9014/Macros_1.scala +++ b/tests/neg-macros/i9014/Macros_1.scala @@ -1,4 +1,4 @@ import scala.quoted._ trait Bar inline given as Bar = ${ impl } -def impl(using qctx: QuoteContext): Expr[Bar] = qctx.throwError("Failed to expand!") +def impl(using qctx: QuoteContext): Expr[Bar] = Reporting.throwError("Failed to expand!") diff --git a/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala b/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala index 6733abc99a62..5a54476dc756 100644 --- a/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala +++ b/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala @@ -3,13 +3,13 @@ import scala.quoted._ import Even._ object EvenFromDigitsImpl: - def apply(digits: Expr[String])(using ctx: QuoteContext): Expr[Even] = digits match { + def apply(digits: Expr[String])(using QuoteContext): Expr[Even] = digits match { case Const(ds) => val ev = try evenFromDigits(ds) catch { case ex: FromDigits.FromDigitsException => - ctx.error(ex.getMessage) + Reporting.error(ex.getMessage) Even(0) } '{Even(${Expr(ev.n)})} diff --git a/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala b/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala index 839e556a7c2f..c24bf5e9339a 100644 --- a/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala +++ b/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala @@ -3,14 +3,14 @@ import scala.util.FromDigits import scala.quoted._ object BigFloatFromDigitsImpl: - def apply(digits: Expr[String])(using ctx: QuoteContext): Expr[BigFloat] = + def apply(digits: Expr[String])(using QuoteContext): Expr[BigFloat] = digits match case Const(ds) => try val BigFloat(m, e) = BigFloat(ds) '{BigFloat(${Expr(m)}, ${Expr(e)})} catch case ex: FromDigits.FromDigitsException => - ctx.error(ex.getMessage) + Reporting.error(ex.getMessage) '{BigFloat(0, 0)} case digits => '{BigFloat($digits)} diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala index 8b656bee9a78..55a1b9aa5154 100644 --- a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala +++ b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala @@ -66,7 +66,7 @@ object Macros { case FromEnv(expr) => expr.asInstanceOf[Expr[R[T]]] case _ => - summon[QuoteContext].error("Expected explicit value but got: " + e.show, e) + Reporting.error("Expected explicit value but got: " + e.show, e) '{ ??? } })