From c4e553578703494b8c0dd9c8c4e77399647c230a Mon Sep 17 00:00:00 2001
From: David Barri <japgolly@gmail.com>
Date: Fri, 9 Apr 2021 08:07:14 +1000
Subject: [PATCH] Rename Expr.valueOr{Error => Throw}

---
 docs/docs/reference/metaprogramming/macros.md |  4 +-
 library/src/scala/quoted/Expr.scala           |  2 +-
 library/src/scala/quoted/Exprs.scala          |  2 +-
 library/src/scala/quoted/Quotes.scala         | 11 ++++-
 tests/bench/power-macro/PowerMacro.scala      |  2 +-
 .../Macro_1.scala                             |  2 +-
 tests/neg-macros/inline-option/Macro_1.scala  |  2 +-
 .../neg-macros/inline-tuples-1/Macro_1.scala  | 44 +++++++++----------
 tests/neg-macros/quote-error-2/Macro_1.scala  |  2 +-
 tests/neg-macros/quote-error/Macro_1.scala    |  2 +-
 .../neg-macros/quote-exception/Macro_1.scala  |  2 +-
 tests/neg-macros/quote-whitebox/Macro_1.scala |  2 +-
 .../neg-macros/reflect-inline/assert_1.scala  |  2 +-
 tests/pos-macros/i11835/X.scala               |  2 +-
 tests/pos-macros/power-macro/Macro_1.scala    |  2 +-
 .../quote-nested-object/Macro_1.scala         |  4 +-
 .../pos-macros/quote-whitebox-2/Macro_1.scala |  2 +-
 tests/pos-staging/quote-0.scala               |  2 +-
 .../run-macros/enum-nat-macro/Macros_2.scala  |  2 +-
 .../Macro_1.scala                             |  6 +--
 tests/run-macros/i10914a/Macro_1.scala        |  2 +-
 tests/run-macros/i10914b/Macro_1.scala        |  2 +-
 tests/run-macros/i11856/Test_1.scala          |  8 ++--
 tests/run-macros/i4734/Macro_1.scala          |  2 +-
 tests/run-macros/i4735/Macro_1.scala          |  2 +-
 tests/run-macros/i4803/Macro_1.scala          |  2 +-
 tests/run-macros/i4803b/Macro_1.scala         |  2 +-
 tests/run-macros/i4803c/Macro_1.scala         |  2 +-
 tests/run-macros/i5188a/Macro_1.scala         |  2 +-
 tests/run-macros/i6201/macro_1.scala          |  4 +-
 tests/run-macros/i6765-c/Macro_1.scala        |  2 +-
 .../Macro_1.scala                             |  2 +-
 tests/run-macros/inline-option/Macro_1.scala  |  4 +-
 .../run-macros/inline-tuples-1/Macro_1.scala  | 44 +++++++++----------
 .../run-macros/inline-tuples-2/Macro_1.scala  |  4 +-
 .../run-macros/inline-varargs-1/Macro_1.scala |  2 +-
 tests/run-macros/power-macro/Macro_1.scala    |  2 +-
 .../quote-and-splice/Macros_1.scala           |  4 +-
 .../quote-matcher-power/Macro_1.scala         |  2 +-
 .../quoted_1.scala                            |  4 +-
 .../quote-simple-macro/quoted_1.scala         |  2 +-
 .../quote-unrolled-foreach/quoted_1.scala     |  2 +-
 tests/run-macros/quote-whitebox/Macro_1.scala |  2 +-
 .../Derivation_1.scala                        |  8 ++--
 .../quoted-expr-block/quoted_1.scala          |  2 +-
 .../Derivation_1.scala                        |  8 ++--
 .../run-macros/reflect-inline/assert_1.scala  |  4 +-
 .../Macros_1.scala                            |  2 +-
 .../xml-interpolation-3/XmlQuote_1.scala      |  2 +-
 49 files changed, 119 insertions(+), 110 deletions(-)

diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
index 1791360e5767..7c4b5aca4ec0 100644
--- a/docs/docs/reference/metaprogramming/macros.md
+++ b/docs/docs/reference/metaprogramming/macros.md
@@ -454,7 +454,7 @@ either a constant or is a parameter that will be a constant when instantiated. T
 aspect is also important for macro expansion.
 
 To get values out of expressions containing constants `Expr` provides the method
-`value` (or `valueOrError`). This will convert the `Expr[T]` into a `Some[T]` (or `T`) when the
+`value` (or `valueOrThrow`). This will convert the `Expr[T]` into a `Some[T]` (or `T`) when the
 expression contains value. Otherwise it will retrun `None` (or emit an error).
 To avoid having incidental val bindings generated by the inlining of the `def`
 it is recommended to use an inline parameter. To illustrate this, consider an
@@ -628,7 +628,7 @@ transparent inline def defaultOf(inline str: String) =
    ${ defaultOfImpl('str) }
 
 def defaultOfImpl(strExpr: Expr[String])(using Quotes): Expr[Any] =
-   strExpr.valueOrError match
+   strExpr.valueOrThrow match
       case "int" => '{1}
       case "string" => '{"a"}
 
diff --git a/library/src/scala/quoted/Expr.scala b/library/src/scala/quoted/Expr.scala
index acc9581b210a..b6320d90c758 100644
--- a/library/src/scala/quoted/Expr.scala
+++ b/library/src/scala/quoted/Expr.scala
@@ -46,7 +46,7 @@ object Expr {
    *    // value: T
    *  ```
    *
-   *  To directly get the value of an expression `expr: Expr[T]` consider using `expr.value`/`expr.valueOrError` instead.
+   *  To directly get the value of an expression `expr: Expr[T]` consider using `expr.value`/`expr.valueOrThrow` instead.
    *  @syntax markdown
    */
   def unapply[T](x: Expr[T])(using FromExpr[T])(using Quotes): Option[T] =
diff --git a/library/src/scala/quoted/Exprs.scala b/library/src/scala/quoted/Exprs.scala
index f4504ed2f50d..e24ed24373b0 100644
--- a/library/src/scala/quoted/Exprs.scala
+++ b/library/src/scala/quoted/Exprs.scala
@@ -14,7 +14,7 @@ object Exprs:
    *      ...
    *  }
    *  ```
-   *  To directly get the value of all expressions in a sequence `exprs: Seq[Expr[T]]` consider using `exprs.map(_.value)`/`exprs.map(_.valueOrError)` instead.
+   *  To directly get the value of all expressions in a sequence `exprs: Seq[Expr[T]]` consider using `exprs.map(_.value)`/`exprs.map(_.valueOrThrow)` instead.
    */
   def unapply[T](exprs: Seq[Expr[T]])(using FromExpr[T])(using Quotes): Option[Seq[T]] =
     val builder = Seq.newBuilder[T]
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
index ea593090c9a0..107b05fb2f5d 100644
--- a/library/src/scala/quoted/Quotes.scala
+++ b/library/src/scala/quoted/Quotes.scala
@@ -53,7 +53,16 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      *  Emits an error and throws if the expression does not represent a value or possibly contains side effects.
      *  Otherwise returns the value.
      */
-    def valueOrError(using FromExpr[T]): T =
+    @deprecated("Use valueOrThrow", "3.0.0")
+    def valueOrError(using e: FromExpr[T]): T =
+      valueOrThrow
+
+    /** Return the value of this expression.
+     *
+     *  Emits an error and throws if the expression does not represent a value or possibly contains side effects.
+     *  Otherwise returns the value.
+     */
+    def valueOrThrow(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"
diff --git a/tests/bench/power-macro/PowerMacro.scala b/tests/bench/power-macro/PowerMacro.scala
index 03a77d927287..eeacd98eddf1 100644
--- a/tests/bench/power-macro/PowerMacro.scala
+++ b/tests/bench/power-macro/PowerMacro.scala
@@ -5,7 +5,7 @@ object PowerMacro {
   inline def power(inline n: Long, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Long], x: Expr[Double])(using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrThrow, x)
 
   def powerCode(n: Long, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
index 4e56b946207a..2ef00f895f4f 100644
--- a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
+++ b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -6,7 +6,7 @@ object E {
 
   inline def eval[T](inline x: E[T]): T = ${ impl('x) }
 
-  def impl[T: Type](x: Expr[E[T]]) (using Quotes): Expr[T] = x.valueOrError.lift
+  def impl[T: Type](x: Expr[E[T]]) (using Quotes): Expr[T] = x.valueOrThrow.lift
 
   implicit def ev1[T: Type]: FromExpr[E[T]] = new FromExpr {
     def unapply(x: Expr[E[T]])(using Quotes) = x match {
diff --git a/tests/neg-macros/inline-option/Macro_1.scala b/tests/neg-macros/inline-option/Macro_1.scala
index f2e3e453fdd2..bd1f0e3d61d1 100644
--- a/tests/neg-macros/inline-option/Macro_1.scala
+++ b/tests/neg-macros/inline-option/Macro_1.scala
@@ -2,7 +2,7 @@
 import scala.quoted.*
 
 object Macro {
-  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrError match {
+  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrThrow match {
     case Some(i) => Expr(i)
     case None => '{-1}
   }
diff --git a/tests/neg-macros/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala
index 031fb01cabe4..4cad030fa213 100644
--- a/tests/neg-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/neg-macros/inline-tuples-1/Macro_1.scala
@@ -2,26 +2,26 @@
 import scala.quoted.*
 
 object Macros {
-  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
 }
diff --git a/tests/neg-macros/quote-error-2/Macro_1.scala b/tests/neg-macros/quote-error-2/Macro_1.scala
index 7a98d7145698..3d9ca5a44b3f 100644
--- a/tests/neg-macros/quote-error-2/Macro_1.scala
+++ b/tests/neg-macros/quote-error-2/Macro_1.scala
@@ -3,7 +3,7 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${ fooImpl('b) }
   def fooImpl(b: Expr[Boolean])(using Quotes): Expr[Unit] =
-    '{println(${msg(b.valueOrError)})}
+    '{println(${msg(b.valueOrThrow)})}
 
   def msg(b: Boolean)(using Quotes): Expr[String] =
     if (b) '{"foo(true)"}
diff --git a/tests/neg-macros/quote-error/Macro_1.scala b/tests/neg-macros/quote-error/Macro_1.scala
index 668f2b99c33b..2c09e28af6df 100644
--- a/tests/neg-macros/quote-error/Macro_1.scala
+++ b/tests/neg-macros/quote-error/Macro_1.scala
@@ -3,6 +3,6 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl('b)}
   def fooImpl(b: Expr[Boolean])(using Quotes) : Expr[Unit] =
-    if (b.valueOrError) '{println("foo(true)")}
+    if (b.valueOrThrow) '{println("foo(true)")}
     else { quotes.reflect.report.error("foo cannot be called with false"); '{ ??? } }
 }
diff --git a/tests/neg-macros/quote-exception/Macro_1.scala b/tests/neg-macros/quote-exception/Macro_1.scala
index 2fa482a81c56..06369c5bbd1f 100644
--- a/tests/neg-macros/quote-exception/Macro_1.scala
+++ b/tests/neg-macros/quote-exception/Macro_1.scala
@@ -3,6 +3,6 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl('b)}
   def fooImpl(b: Expr[Boolean]) (using Quotes): Expr[Unit] =
-    if (b.valueOrError) '{println("foo(true)")}
+    if (b.valueOrThrow) '{println("foo(true)")}
     else ???
 }
diff --git a/tests/neg-macros/quote-whitebox/Macro_1.scala b/tests/neg-macros/quote-whitebox/Macro_1.scala
index a18fccbc166e..6c58bcbb35cd 100644
--- a/tests/neg-macros/quote-whitebox/Macro_1.scala
+++ b/tests/neg-macros/quote-whitebox/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object Macros {
   transparent inline def defaultOf(inline str: String): Any = ${ defaultOfImpl('str) }
-  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrError match {
+  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrThrow match {
     case "int" => '{1}
     case "string" => '{"a"}
   }
diff --git a/tests/neg-macros/reflect-inline/assert_1.scala b/tests/neg-macros/reflect-inline/assert_1.scala
index 2c5b324450c5..d7718702baff 100644
--- a/tests/neg-macros/reflect-inline/assert_1.scala
+++ b/tests/neg-macros/reflect-inline/assert_1.scala
@@ -5,6 +5,6 @@ object api {
     ${ stripImpl('x) }
 
   private def stripImpl(x: Expr[String])(using Quotes): Expr[String] =
-    Expr(x.valueOrError.stripMargin)
+    Expr(x.valueOrThrow.stripMargin)
 
 }
diff --git a/tests/pos-macros/i11835/X.scala b/tests/pos-macros/i11835/X.scala
index ccc05e9e57c3..4ca903a9d6f5 100644
--- a/tests/pos-macros/i11835/X.scala
+++ b/tests/pos-macros/i11835/X.scala
@@ -8,5 +8,5 @@ object X:
     import quotes.reflect.*
     println("="*120)
     println(b.asTerm)
-    println(b.valueOrError)
+    println(b.valueOrThrow)
     '{()}
diff --git a/tests/pos-macros/power-macro/Macro_1.scala b/tests/pos-macros/power-macro/Macro_1.scala
index 009947d4fe1f..0514d58fb854 100644
--- a/tests/pos-macros/power-macro/Macro_1.scala
+++ b/tests/pos-macros/power-macro/Macro_1.scala
@@ -6,7 +6,7 @@ object PowerMacro {
   inline def power(inline n: Long, x: Double) = ${powerCode('n, 'x)}
 
   def powerCode(n: Expr[Long], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrThrow, x)
 
   def powerCode(n: Long, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/pos-macros/quote-nested-object/Macro_1.scala b/tests/pos-macros/quote-nested-object/Macro_1.scala
index 19746c270840..6b9d3b2307b1 100644
--- a/tests/pos-macros/quote-nested-object/Macro_1.scala
+++ b/tests/pos-macros/quote-nested-object/Macro_1.scala
@@ -9,7 +9,7 @@ object Macro {
     inline def plus(inline n: Int, m: Int): Int = ${ plus('n, 'm) }
 
     def plus(n: Expr[Int], m: Expr[Int]) (using Quotes): Expr[Int] =
-      if (n.valueOrError == 0) m
+      if (n.valueOrThrow == 0) m
       else '{ ${n} + $m }
 
     object Implementation2 {
@@ -17,7 +17,7 @@ object Macro {
       inline def plus(inline n: Int, m: Int): Int = ${ plus('n, 'm) }
 
       def plus(n: Expr[Int], m: Expr[Int]) (using Quotes): Expr[Int] =
-        if (n.valueOrError == 0) m
+        if (n.valueOrThrow == 0) m
         else '{ ${n} + $m }
     }
   }
diff --git a/tests/pos-macros/quote-whitebox-2/Macro_1.scala b/tests/pos-macros/quote-whitebox-2/Macro_1.scala
index 8113cedbc113..42147777d4f8 100644
--- a/tests/pos-macros/quote-whitebox-2/Macro_1.scala
+++ b/tests/pos-macros/quote-whitebox-2/Macro_1.scala
@@ -6,7 +6,7 @@ object Macro {
   transparent inline def charOrString(inline str: String): Any = ${ impl('str) }
 
   def impl(strExpr: Expr[String]) (using Quotes)=
-    val str = strExpr.valueOrError
+    val str = strExpr.valueOrThrow
     if (str.length == 1) Expr(str.charAt(0)) else Expr(str)
 
 }
diff --git a/tests/pos-staging/quote-0.scala b/tests/pos-staging/quote-0.scala
index a9eb68ffce5f..5c0402311027 100644
--- a/tests/pos-staging/quote-0.scala
+++ b/tests/pos-staging/quote-0.scala
@@ -16,7 +16,7 @@ object Macros {
   inline def power(inline n: Int, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Int], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrThrow, x)
 
   def powerCode(n: Int, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/enum-nat-macro/Macros_2.scala b/tests/run-macros/enum-nat-macro/Macros_2.scala
index c533888718ba..76ae797e8e25 100644
--- a/tests/run-macros/enum-nat-macro/Macros_2.scala
+++ b/tests/run-macros/enum-nat-macro/Macros_2.scala
@@ -25,6 +25,6 @@ import Nat.*
        case 0 => acc
        case n => inner[Succ[N]](n - 1, '{Succ($acc)})
 
-     val i = int.valueOrError
+     val i = int.valueOrThrow
      require(i >= 0)
      inner[Zero.type](i, '{Zero})
diff --git a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
index 1d085d3a2c15..baaf9146b082 100644
--- a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
+++ b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
@@ -44,7 +44,7 @@ object TypeToolbox {
   inline def fieldIn[T](inline mem: String): String = ${fieldInImpl[T]('mem)}
   private def fieldInImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[String] = {
     import quotes.reflect.*
-    val field = TypeTree.of[T].symbol.declaredField(mem.valueOrError)
+    val field = TypeTree.of[T].symbol.declaredField(mem.valueOrThrow)
     Expr(if field.isNoSymbol then "" else field.name)
   }
 
@@ -58,7 +58,7 @@ object TypeToolbox {
   inline def methodIn[T](inline mem: String): Seq[String] = ${methodInImpl[T]('mem)}
   private def methodInImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[Seq[String]] = {
     import quotes.reflect.*
-    Expr(TypeTree.of[T].symbol.declaredMethod(mem.valueOrError).map(_.name))
+    Expr(TypeTree.of[T].symbol.declaredMethod(mem.valueOrThrow).map(_.name))
   }
 
   inline def methodsIn[T]: Seq[String] = ${methodsInImpl[T]}
@@ -70,7 +70,7 @@ object TypeToolbox {
   inline def method[T](inline mem: String): Seq[String] = ${methodImpl[T]('mem)}
   private def methodImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[Seq[String]] = {
     import quotes.reflect.*
-    Expr(TypeTree.of[T].symbol.memberMethod(mem.valueOrError).map(_.name))
+    Expr(TypeTree.of[T].symbol.memberMethod(mem.valueOrThrow).map(_.name))
   }
 
   inline def methods[T]: Seq[String] = ${methodsImpl[T]}
diff --git a/tests/run-macros/i10914a/Macro_1.scala b/tests/run-macros/i10914a/Macro_1.scala
index 0a1b8088d04c..9ed0fe5e6652 100644
--- a/tests/run-macros/i10914a/Macro_1.scala
+++ b/tests/run-macros/i10914a/Macro_1.scala
@@ -24,7 +24,7 @@ object Dsl {
     import quotes.reflect.*
     val inputs = c match
       case '{ Container($list) } =>
-        list.valueOrError
+        list.valueOrThrow
       case _ => report.throwError("Cannot Extract List from Container")
     '{ Entity(${Expr(inputs.head.value)}) }
 }
diff --git a/tests/run-macros/i10914b/Macro_1.scala b/tests/run-macros/i10914b/Macro_1.scala
index 680f189a3566..e87a3e46ae65 100644
--- a/tests/run-macros/i10914b/Macro_1.scala
+++ b/tests/run-macros/i10914b/Macro_1.scala
@@ -28,7 +28,7 @@ object Dsl {
     import quotes.reflect.*
     val inputs = c match
       case '{ Container($list) } =>
-        list.valueOrError
+        list.valueOrThrow
       case _ => report.throwError("Cannot Extract List from Container")
     '{ Entity(${Expr(inputs.head.value)}) }
 }
diff --git a/tests/run-macros/i11856/Test_1.scala b/tests/run-macros/i11856/Test_1.scala
index 2b31f3a4a570..98d22645549d 100644
--- a/tests/run-macros/i11856/Test_1.scala
+++ b/tests/run-macros/i11856/Test_1.scala
@@ -5,8 +5,8 @@ object Str:
         ${ evalConcat('a, 'b) }
 
     def evalConcat(expra: Expr[String], exprb: Expr[String])(using Quotes): Expr[String] =
-        val a = expra.valueOrError
-        val b = exprb.valueOrError
+        val a = expra.valueOrThrow
+        val b = exprb.valueOrThrow
         Expr(a ++ b)
 
 object I:
@@ -14,6 +14,6 @@ object I:
       ${ evalConcat('a, 'b) }
 
   def evalConcat(expra: Expr[Int], exprb: Expr[Int])(using Quotes): Expr[Int] =
-      val a = expra.valueOrError
-      val b = exprb.valueOrError
+      val a = expra.valueOrThrow
+      val b = exprb.valueOrThrow
       Expr(a + b)
\ No newline at end of file
diff --git a/tests/run-macros/i4734/Macro_1.scala b/tests/run-macros/i4734/Macro_1.scala
index 30b12d2fce36..cf0da3e2547c 100644
--- a/tests/run-macros/i4734/Macro_1.scala
+++ b/tests/run-macros/i4734/Macro_1.scala
@@ -6,7 +6,7 @@ object Macros {
     ${ unrolledForeachImpl('seq, 'f, 'unrollSize) }
 
   def unrolledForeachImpl(seq: Expr[IndexedSeq[Int]], f: Expr[Int => Unit], unrollSizeExpr: Expr[Int]) (using Quotes): Expr[Unit] =
-    unrolledForeachImpl(seq, f, unrollSizeExpr.valueOrError)
+    unrolledForeachImpl(seq, f, unrollSizeExpr.valueOrThrow)
 
   def unrolledForeachImpl(seq: Expr[IndexedSeq[Int]], f: Expr[Int => Unit], unrollSize: Int)(using Quotes): Expr[Unit] = '{
     val size = ($seq).length
diff --git a/tests/run-macros/i4735/Macro_1.scala b/tests/run-macros/i4735/Macro_1.scala
index 54cdcb574c91..e5e5e07634cb 100644
--- a/tests/run-macros/i4735/Macro_1.scala
+++ b/tests/run-macros/i4735/Macro_1.scala
@@ -14,7 +14,7 @@ object Macro {
     while (i < size) {
       println("<log> start loop")
       ${
-        for (j <- new UnrolledRange(0, unrollSize.valueOrError)) '{
+        for (j <- new UnrolledRange(0, unrollSize.valueOrThrow)) '{
           val element = ($seq)(i + ${Expr(j)})
           ${Expr.betaReduce('{$f(element)})} // or `($f)(element)` if `f` should not be inlined
         }
diff --git a/tests/run-macros/i4803/Macro_1.scala b/tests/run-macros/i4803/Macro_1.scala
index 9ff32194c708..ebc2b2284a23 100644
--- a/tests/run-macros/i4803/Macro_1.scala
+++ b/tests/run-macros/i4803/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrThrow)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i4803b/Macro_1.scala b/tests/run-macros/i4803b/Macro_1.scala
index ab82cb100dc3..d410e06d24e3 100644
--- a/tests/run-macros/i4803b/Macro_1.scala
+++ b/tests/run-macros/i4803b/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrThrow)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i4803c/Macro_1.scala b/tests/run-macros/i4803c/Macro_1.scala
index 2058a0bc4b3b..02ddefea0a9f 100644
--- a/tests/run-macros/i4803c/Macro_1.scala
+++ b/tests/run-macros/i4803c/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrThrow)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i5188a/Macro_1.scala b/tests/run-macros/i5188a/Macro_1.scala
index 252f5245c9ea..77d7d6574e7d 100644
--- a/tests/run-macros/i5188a/Macro_1.scala
+++ b/tests/run-macros/i5188a/Macro_1.scala
@@ -2,5 +2,5 @@ import scala.quoted.*
 
 object Lib {
   inline def sum(inline args: Int*): Int = ${ impl('args) }
-  def impl(args: Expr[Seq[Int]]) (using Quotes): Expr[Int] = Expr(args.valueOrError.sum)
+  def impl(args: Expr[Seq[Int]]) (using Quotes): Expr[Int] = Expr(args.valueOrThrow.sum)
 }
diff --git a/tests/run-macros/i6201/macro_1.scala b/tests/run-macros/i6201/macro_1.scala
index 2b87f431f3d9..630b3406399d 100644
--- a/tests/run-macros/i6201/macro_1.scala
+++ b/tests/run-macros/i6201/macro_1.scala
@@ -4,10 +4,10 @@ extension (inline x: String) inline def strip: String =
   ${ stripImpl('x) }
 
 def stripImpl(x: Expr[String])(using Quotes) : Expr[String] =
-  Expr(x.valueOrError.stripMargin)
+  Expr(x.valueOrThrow.stripMargin)
 
 inline def isHello(inline x: String): Boolean =
   ${ isHelloImpl('x) }
 
 def isHelloImpl(x: Expr[String])(using Quotes) : Expr[Boolean] =
-  if (x.valueOrError == "hello") Expr(true) else Expr(false)
+  if (x.valueOrThrow == "hello") Expr(true) else Expr(false)
diff --git a/tests/run-macros/i6765-c/Macro_1.scala b/tests/run-macros/i6765-c/Macro_1.scala
index c3401a7f53da..3591f7946a29 100644
--- a/tests/run-macros/i6765-c/Macro_1.scala
+++ b/tests/run-macros/i6765-c/Macro_1.scala
@@ -3,6 +3,6 @@ import scala.quoted.*
 inline def foo(inline n: Int) = ${fooImpl('n)}
 
 def fooImpl(n: Expr[Int])(using Quotes) = {
-  val res = Expr.ofList(List.tabulate(n.valueOrError)(i => Expr("#" + i)))
+  val res = Expr.ofList(List.tabulate(n.valueOrThrow)(i => Expr("#" + i)))
   '{ ${Expr(res.show)} + "\n" + $res.toString + "\n" }
 }
diff --git a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
index d8cf1c788851..36b18d092e8c 100644
--- a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
+++ b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -7,7 +7,7 @@ object E {
   inline def eval[T](inline x: E[T]): T = ${ impl('x) }
 
   def impl[T: Type](expr: Expr[E[T]]) (using Quotes): Expr[T] =
-    expr.valueOrError.lift
+    expr.valueOrThrow.lift
 
   implicit def ev1[T: Type]: FromExpr[E[T]] = new FromExpr { // TODO use type class derivation
     def unapply(x: Expr[E[T]])(using Quotes) = (x match {
diff --git a/tests/run-macros/inline-option/Macro_1.scala b/tests/run-macros/inline-option/Macro_1.scala
index 4021658bc17a..ba918a1d8d5c 100644
--- a/tests/run-macros/inline-option/Macro_1.scala
+++ b/tests/run-macros/inline-option/Macro_1.scala
@@ -3,11 +3,11 @@ import scala.quoted.*
 
 object Macros {
 
-  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrError match {
+  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrThrow match {
     case Some(i) => Expr(i)
     case None => '{-1}
   }
 
-  def impl2(opt: Expr[Option[Option[Int]]]) (using Quotes): Expr[Int] = impl(Expr(opt.valueOrError.flatten))
+  def impl2(opt: Expr[Option[Option[Int]]]) (using Quotes): Expr[Int] = impl(Expr(opt.valueOrThrow.flatten))
 
 }
diff --git a/tests/run-macros/inline-tuples-1/Macro_1.scala b/tests/run-macros/inline-tuples-1/Macro_1.scala
index 031fb01cabe4..4cad030fa213 100644
--- a/tests/run-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-1/Macro_1.scala
@@ -2,26 +2,26 @@
 import scala.quoted.*
 
 object Macros {
-  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow.productIterator.map(_.asInstanceOf[Int]).sum)
 }
diff --git a/tests/run-macros/inline-tuples-2/Macro_1.scala b/tests/run-macros/inline-tuples-2/Macro_1.scala
index 7027a1f2680a..f4a135bd83d9 100644
--- a/tests/run-macros/inline-tuples-2/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-2/Macro_1.scala
@@ -3,8 +3,8 @@ import scala.quoted.*
 
 object Macros {
 
-  def impl(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError._1)
+  def impl(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrThrow._1)
 
-  def impl2(tup: Expr[Tuple1[Tuple1[Int]]]) (using Quotes): Expr[Int] = impl(Expr(tup.valueOrError._1))
+  def impl2(tup: Expr[Tuple1[Tuple1[Int]]]) (using Quotes): Expr[Int] = impl(Expr(tup.valueOrThrow._1))
 
 }
diff --git a/tests/run-macros/inline-varargs-1/Macro_1.scala b/tests/run-macros/inline-varargs-1/Macro_1.scala
index ed58d1479059..61274e4bb2e2 100644
--- a/tests/run-macros/inline-varargs-1/Macro_1.scala
+++ b/tests/run-macros/inline-varargs-1/Macro_1.scala
@@ -2,5 +2,5 @@
 import scala.quoted.*
 
 object Macros {
-  def sum(nums: Expr[Int]*) (using Quotes): Expr[Int] = Expr(nums.map(_.valueOrError).sum)
+  def sum(nums: Expr[Int]*) (using Quotes): Expr[Int] = Expr(nums.map(_.valueOrThrow).sum)
 }
diff --git a/tests/run-macros/power-macro/Macro_1.scala b/tests/run-macros/power-macro/Macro_1.scala
index 57d468fd7dc1..15928a02998e 100644
--- a/tests/run-macros/power-macro/Macro_1.scala
+++ b/tests/run-macros/power-macro/Macro_1.scala
@@ -4,7 +4,7 @@ import scala.quoted.*
 inline def power(x: Double, inline n: Int) = ${ powerCode1('x, 'n) }
 
 private def powerCode1(using Quotes)(x: Expr[Double], n: Expr[Int]): Expr[Double] =
-  powerCode(x, n.valueOrError)
+  powerCode(x, n.valueOrThrow)
 
 private def powerCode(using Quotes)(x: Expr[Double], n: Int): Expr[Double] =
   if (n == 0) Expr(1.0)
diff --git a/tests/run-macros/quote-and-splice/Macros_1.scala b/tests/run-macros/quote-and-splice/Macros_1.scala
index e799318eac12..f7f1de66328d 100644
--- a/tests/run-macros/quote-and-splice/Macros_1.scala
+++ b/tests/run-macros/quote-and-splice/Macros_1.scala
@@ -6,7 +6,7 @@ object Macros {
   def macro1Impl (using Quotes)= '{3}
 
   inline def macro2(inline p: Boolean) = ${ macro2Impl('p) }
-  def macro2Impl(p: Expr[Boolean]) (using Quotes)= if (p.valueOrError) '{3} else '{4}
+  def macro2Impl(p: Expr[Boolean]) (using Quotes)= if (p.valueOrThrow) '{3} else '{4}
 
   inline def macro3(n: Int) = ${ macro3Impl('n) }
   def macro3Impl(p: Expr[Int]) (using Quotes)= '{ 2 + $p }
@@ -20,7 +20,7 @@ object Macros {
   inline def power(inline n: Int, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Int], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrThrow, x)
 
   def powerCode(n: Int, x: Expr[Double]) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/quote-matcher-power/Macro_1.scala b/tests/run-macros/quote-matcher-power/Macro_1.scala
index da21736282df..734c3135bedc 100644
--- a/tests/run-macros/quote-matcher-power/Macro_1.scala
+++ b/tests/run-macros/quote-matcher-power/Macro_1.scala
@@ -4,7 +4,7 @@ import scala.quoted.*
 object Macros {
 
   def power_s(x: Expr[Double], n: Expr[Int]) (using Quotes): Expr[Double] =
-    power_s(x, n.valueOrError)
+    power_s(x, n.valueOrThrow)
 
   def power_s(x: Expr[Double], n: Int) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
index f425cd25ae6d..d82e7c25b8db 100644
--- a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
+++ b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
@@ -9,8 +9,8 @@ object Macros {
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using Quotes): Expr[String] = {
     (self, args) match {
       case ('{ StringContext(${Varargs(parts)}*) }, Varargs(args1)) =>
-        val strParts = parts.map(_.valueOrError.reverse)
-        val strArgs = args1.map(_.valueOrError)
+        val strParts = parts.map(_.valueOrThrow.reverse)
+        val strArgs = args1.map(_.valueOrThrow)
         Expr(StringContext(strParts*).s(strArgs*))
       case _ => ???
     }
diff --git a/tests/run-macros/quote-simple-macro/quoted_1.scala b/tests/run-macros/quote-simple-macro/quoted_1.scala
index bd39612bf3ca..a9d0ea347f30 100644
--- a/tests/run-macros/quote-simple-macro/quoted_1.scala
+++ b/tests/run-macros/quote-simple-macro/quoted_1.scala
@@ -2,5 +2,5 @@ import scala.quoted.*
 
 object Macros {
   inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar('i, 'j) }
-  def bar(x: Expr[Int], y: Expr[Int]) (using Quotes): Expr[Int] = '{ ${Expr(x.valueOrError)} + $y }
+  def bar(x: Expr[Int], y: Expr[Int]) (using Quotes): Expr[Int] = '{ ${Expr(x.valueOrThrow)} + $y }
 }
diff --git a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
index c84cd639bda7..3455ed4297e6 100644
--- a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
+++ b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
@@ -7,7 +7,7 @@ object Macro {
     ${unrolledForeachImpl('unrollSize, 'seq, 'f)}
 
   private def unrolledForeachImpl(unrollSizeExpr: Expr[Int], seq: Expr[Array[Int]], f: Expr[Int => Unit]) (using Quotes): Expr[Unit] =
-    unrolledForeachImpl(unrollSizeExpr.valueOrError, seq, f)
+    unrolledForeachImpl(unrollSizeExpr.valueOrThrow, seq, f)
 
   private def unrolledForeachImpl(unrollSize: Int, seq: Expr[Array[Int]], f: Expr[Int => Unit])(using Quotes): Expr[Unit] = '{
     val size = $seq.length
diff --git a/tests/run-macros/quote-whitebox/Macro_1.scala b/tests/run-macros/quote-whitebox/Macro_1.scala
index a18fccbc166e..6c58bcbb35cd 100644
--- a/tests/run-macros/quote-whitebox/Macro_1.scala
+++ b/tests/run-macros/quote-whitebox/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object Macros {
   transparent inline def defaultOf(inline str: String): Any = ${ defaultOfImpl('str) }
-  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrError match {
+  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrThrow match {
     case "int" => '{1}
     case "string" => '{"a"}
   }
diff --git a/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala b/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
index a080ad96109d..331655bb5786 100644
--- a/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
+++ b/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
@@ -7,7 +7,7 @@ object ToExprMaker {
   inline given derived[T](using inline m: Mirror.Of[T]): ToExpr[T] = ${ derivedExpr('m) }
 
   private def derivedExpr[T](mirrorExpr: Expr[Mirror.Of[T]])(using Quotes, Type[T]): Expr[ToExpr[T]] = {
-    val tpe = summonExprOrError[Type[T]]
+    val tpe = summonExprOrThrow[Type[T]]
     mirrorExpr match {
       case '{ $mirrorExpr : Mirror.Sum { type MirroredElemTypes = mirroredElemTypes } } =>
         val liftables = elemTypesToExprs[mirroredElemTypes]
@@ -36,7 +36,7 @@ object ToExprMaker {
     liftables: Seq[ToExpr[_]]
   )(using Type[T]) extends ToExpr[T]:
       def apply(x: T)(using Quotes): Expr[T] =
-        val mirrorExpr = summonExprOrError[Mirror.ProductOf[T]]
+        val mirrorExpr = summonExprOrThrow[Mirror.ProductOf[T]]
         val xProduct = x.asInstanceOf[Product]
         val anyToExprs = liftables.asInstanceOf[Seq[ToExpr[Any]]]
         val elemExprs =
@@ -49,7 +49,7 @@ object ToExprMaker {
 
   private def elemTypesToExprs[X: Type](using Quotes): List[Expr[ToExpr[_]]] =
     Type.of[X] match
-      case '[ head *: tail ] => summonExprOrError[ToExpr[head]] :: elemTypesToExprs[tail]
+      case '[ head *: tail ] => summonExprOrThrow[ToExpr[head]] :: elemTypesToExprs[tail]
       case '[ EmptyTuple ] => Nil
 
   private def elemType[X: Type](ordinal: Int)(using Quotes): Type[_] =
@@ -58,7 +58,7 @@ object ToExprMaker {
         if ordinal == 0 then Type.of[head]
         else elemType[tail](ordinal - 1)
 
-  private def summonExprOrError[T: Type](using Quotes): Expr[T] =
+  private def summonExprOrThrow[T: Type](using Quotes): Expr[T] =
     Expr.summon[T] match
       case Some(expr) => expr
       case None =>
diff --git a/tests/run-macros/quoted-expr-block/quoted_1.scala b/tests/run-macros/quoted-expr-block/quoted_1.scala
index 8d2403df4c10..937a6800c166 100644
--- a/tests/run-macros/quoted-expr-block/quoted_1.scala
+++ b/tests/run-macros/quoted-expr-block/quoted_1.scala
@@ -5,5 +5,5 @@ inline def replicate(inline times: Int, code: => Any) = ${replicateImpl('times,
 private def replicateImpl(times: Expr[Int], code: Expr[Any]) (using Quotes)= {
   @annotation.tailrec def loop(n: Int, accum: List[Expr[Any]]): List[Expr[Any]] =
     if (n > 0) loop(n - 1, code :: accum) else accum
-  Expr.block(loop(times.valueOrError, Nil), '{})
+  Expr.block(loop(times.valueOrThrow, Nil), '{})
 }
diff --git a/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala b/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
index 7c199910652c..eeae73fbc7b3 100644
--- a/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
+++ b/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
@@ -12,7 +12,7 @@ object Lft {
   inline given derived[T](using inline m: Mirror.Of[T]): Lft[T] = ${ derivedExpr('m) }
 
   private def derivedExpr[T](mirrorExpr: Expr[Mirror.Of[T]])(using Quotes, Type[T]): Expr[Lft[T]] = {
-    val tpe = summonExprOrError[Type[T]]
+    val tpe = summonExprOrThrow[Type[T]]
     mirrorExpr match {
       case '{ $mirrorExpr : Mirror.Sum { type MirroredElemTypes = mirroredElemTypes } } =>
         val liftables = elemTypesLfts[mirroredElemTypes]
@@ -39,7 +39,7 @@ object Lft {
     liftables: Seq[Lft[_]]
   )(using Type[T]) extends Lft[T]:
       def toExpr(x: T)(using Quotes): Expr[T] =
-        val mirrorExpr = summonExprOrError[Mirror.ProductOf[T]]
+        val mirrorExpr = summonExprOrThrow[Mirror.ProductOf[T]]
         val xProduct = x.asInstanceOf[Product]
         val anyLiftables = liftables.asInstanceOf[Seq[Lft[Any]]]
         val elemExprs =
@@ -52,7 +52,7 @@ object Lft {
 
   private def elemTypesLfts[X: Type](using Quotes): List[Expr[Lft[_]]] =
     Type.of[X] match
-      case '[ head *: tail ] => summonExprOrError[Lft[head]] :: elemTypesLfts[tail]
+      case '[ head *: tail ] => summonExprOrThrow[Lft[head]] :: elemTypesLfts[tail]
       case '[ EmptyTuple ] => Nil
 
   private def elemType[X: Type](ordinal: Int)(using Quotes): Type[_] =
@@ -61,7 +61,7 @@ object Lft {
         if ordinal == 0 then Type.of[head]
         else elemType[tail](ordinal - 1)
 
-  private def summonExprOrError[T: Type](using Quotes): Expr[T] =
+  private def summonExprOrThrow[T: Type](using Quotes): Expr[T] =
     Expr.summon[T] match
       case Some(expr) => expr
       case None =>
diff --git a/tests/run-macros/reflect-inline/assert_1.scala b/tests/run-macros/reflect-inline/assert_1.scala
index 6c797be0fc85..77fc2959f580 100644
--- a/tests/run-macros/reflect-inline/assert_1.scala
+++ b/tests/run-macros/reflect-inline/assert_1.scala
@@ -5,12 +5,12 @@ object api {
     ${ stripImpl('x) }
 
   private def stripImpl(x: Expr[String])(using Quotes): Expr[String] =
-    Expr(augmentString(x.valueOrError).stripMargin)
+    Expr(augmentString(x.valueOrThrow).stripMargin)
 
   inline def typeChecks(inline x: String): Boolean =
     ${ typeChecksImpl('{scala.compiletime.testing.typeChecks(x)}) }
 
   private def typeChecksImpl(b: Expr[Boolean])(using Quotes): Expr[Boolean] = {
-    if (b.valueOrError) Expr(true) else Expr(false)
+    if (b.valueOrThrow) Expr(true) else Expr(false)
   }
 }
diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
index 14d43bd98657..985f38fc44d3 100644
--- a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
+++ b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
@@ -52,7 +52,7 @@ object Macro {
 
   private def fooCore(parts: Seq[Expr[String]], args: Seq[Expr[Any]], reporter: Reporter)(using Quotes): Expr[String] = {
     for ((part, idx) <- parts.zipWithIndex) {
-      val v = part.valueOrError
+      val v = part.valueOrThrow
       if (v.contains("#"))
         reporter.errorOnPart("Cannot use #", idx)
     }
diff --git a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
index 5f3505be3fe7..129fd60794db 100644
--- a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
+++ b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
@@ -12,7 +12,7 @@ object XmlQuote {
   }
 
   def impl(receiver: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes): Expr[Xml] = {
-    val string = receiver.valueOrError.parts.mkString("??")
+    val string = receiver.valueOrThrow.parts.mkString("??")
     '{new Xml(${Expr(string)}, $args.toList)}
   }
 }