Remove scala.quoted.show.apply and use Expr.show

`scala.quoted.show.apply` was only intorduced to reduce the diff in the tests.
Instead we use the equivalent `run(expr.show.toExpr)` notation explicitly.
This has the added advantage of showing explicitly where new compiler runs are located.

Author: nicolasstucki

compiler/test-resources/repl-macros/i6007

@@ -1,8 +1,9 @@
 scala> implicit def toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
 def toolbox: quoted.Toolbox
+scala> import scala.quoted._
 scala> val v = '{ (if true then Some(1) else None).map(v => v+1) }
 val v: quoted.Expr[Option[Int]] = Expr(<pickled tasty>)
-scala> scala.quoted.show(v)
+scala> scala.quoted.run(v.show.toExpr)
 val res0: String = (if (true) scala.Some.apply[scala.Int](1) else scala.None).map[scala.Int](((v: scala.Int) => v.+(1)))
 scala> scala.quoted.run(v)
 val res1: Option[Int] = Some(2)

library/src/scala/quoted/show/package.scala

@@ -10,7 +10,7 @@ object Test {
     def test(expr: String): Unit = {
       val t = toolbox.parse(expr)
       println(expr)
-      println(show(t, printPositions = true))
+      println(run(t, printPositions = true.show.toExpr))
       println()
     }
     val tests = """

tests/disabled/reflect/run/position-val-def.scala

@@ -5,6 +5,6 @@ object Test {
       val z: $t = $x
     }
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(show(f('{2})(Type.IntTag)))
+    println(run(f('{2})(Type.IntTag).show.toExpr))
   }
 }

tests/run-with-compiler/i3823-b.scala

@@ -5,6 +5,6 @@ object Test {
       val z = $x
     }
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(show(f('{2})(Type.IntTag)))
+    println(run(f('{2})(Type.IntTag).show.toExpr))
   }
 }

tests/run-with-compiler/i3823-c.scala

@@ -5,6 +5,6 @@ object Test {
       val z: $t = $x
     }
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(show(f('{2})('[Int])))
+    println(run(f('{2})('[Int]).show.toExpr))
   }
 }

tests/run-with-compiler/i3823.scala

@@ -18,6 +18,6 @@ object Test {
     import Arrays._
     implicit val ct: Expr[ClassTag[Int]] = '{ClassTag.Int}
     val arr: Expr[Array[List[Int]]] = Array[List[Int]](List(1, 2, 3)).toExpr
-    println(show(arr))
+    println(run(arr.show.toExpr))
   }
 }

tests/run-with-compiler/i3847-b.scala

@@ -18,6 +18,6 @@ object Test {
     import Arrays._
     implicit val ct: Expr[ClassTag[Int]] = '{ClassTag.Int}
     val arr: Expr[Array[Int]] = Array[Int](1, 2, 3).toExpr
-    println(show(arr))
+    println(run(arr.show.toExpr))
   }
 }

tests/run-with-compiler/i3847.scala

@@ -11,6 +11,6 @@ object Test {
     }
 
     println(run(f2(x)))
-    println(show(f2(x)))
+    println(run(f2(x).show.toExpr))
   }
 }

tests/run-with-compiler/i3876-b.scala

@@ -11,6 +11,6 @@ object Test {
     }
 
     println(run(f3(x)))
-    println(show(f3(x))) // TODO improve printer
+    println(run(f3(x).show.toExpr)) // TODO improve printer
   }
 }

tests/run-with-compiler/i3876-c.scala

@@ -9,7 +9,7 @@ object Test {
       inlineLambda
     }
     println(run(f4(x)))
-    println(show(f4(x)))
+    println(run(f4(x).show.toExpr))
   }
 
   inline def inlineLambda <: Int => Int = x => x + x

tests/run-with-compiler/i3876-d.scala

@@ -9,7 +9,7 @@ object Test {
       inlineLambda
     }
     println(run(f4(x)))
-    println(show(f4(x)))
+    println(run(f4(x).show.toExpr))
   }
 
   inline def inlineLambda <: Int => Int = x => x + x

tests/run-with-compiler/i3876-e.scala

@@ -8,6 +8,6 @@ object Test {
     val f: Expr[Int => Int] = '{ (x: Int) => x + x }
 
     println(run(f(x)))
-    println(show(f(x)))
+    println(run(f(x).show.toExpr))
   }
 }

tests/run-with-compiler/i3876.scala

@@ -3,7 +3,7 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val u: Expr[Unit] = '{}
-    println(show(u))
+    println(run(u.show.toExpr))
     println(run(u))
   }
 }

tests/run-with-compiler/i3946.scala

@@ -5,7 +5,7 @@ class Foo {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val e: Expr[Int] = '{3}
     val q = '{ ${ '{ $e } } }
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }
 

tests/run-with-compiler/i4044a.scala

@@ -22,6 +22,6 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = VarRef('{4})(varRef => '{ ${varRef.update('{3})}; ${varRef.expr} })
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/i4044b.scala

@@ -4,7 +4,7 @@ class Foo {
   def foo: Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = '{ ${ '{ ${ '{ 5 } } } } }
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }
 

tests/run-with-compiler/i4044c.scala

@@ -7,7 +7,7 @@ class Foo {
     val f: Expr[Int] = '{5}
     val t: Type[Int] = '[Int]
     val q = '{ ${ '{ ($e + $f).asInstanceOf[$t] } } }
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }
 

tests/run-with-compiler/i4044e.scala

@@ -14,7 +14,7 @@ class Foo {
         foo('{e1 + $u}, '{f1})
       }
     }
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }
 

tests/run-with-compiler/i4044f.scala

@@ -8,7 +8,7 @@ class Foo[T: Type] {
 object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(show((new Foo[Object]).q))
-    println(show((new Foo[String]).q))
+    println(run((new Foo[Object]).q.show.toExpr))
+    println(run((new Foo[String]).q.show.toExpr))
   }
 }

tests/run-with-compiler/i4350.scala

@@ -10,7 +10,7 @@ object Test {
 
   def main(args: Array[String]): Unit = {
     val p = peval1()
-    println(show(p))
+    println(run(p.show.toExpr))
   }
 
 }

tests/run-with-compiler/i5144.scala

@@ -10,7 +10,7 @@ object Test {
 
   def main(args: Array[String]): Unit = {
     val p = peval1()
-    println(show(p))
+    println(run(p.show.toExpr))
   }
 
 }

tests/run-with-compiler/i5152.scala

@@ -26,6 +26,6 @@ object Test {
     val test = Add(Int2(1), Int2(1))
     val res = evalTest(test)
     println("run : " + run(res))
-    println("show : " + show(res))
+    println("show : " + run(res.show.toExpr))
   }
 }

tests/run-with-compiler/i5161.scala

@@ -9,9 +9,9 @@ object Test {
       if (x.isInstanceOf[Some[_]]) Option(1)
       else None
     }
-    println("show0 : " + show(res))
+    println("show0 : " + run(res.show.toExpr))
     println("run1 : " + run(res))
     println("run2 : " + run(res))
-    println("show3 : " + show(res))
+    println("show3 : " + run(res.show.toExpr))
   }
 }

tests/run-with-compiler/i5161b.scala

@@ -2,8 +2,8 @@ import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(show(foo[Object]))
-    println(show(bar[Object]))
+    println(run(foo[Object].show.toExpr))
+    println(run(bar[Object].show.toExpr))
   }
   def foo[H : Type]: Expr[H] = {
     val t = '[H]

tests/run-with-compiler/i5247.scala

@@ -8,15 +8,15 @@ object Test {
   def main(args: Array[String]): Unit = {
     '[List]
     val list = bound('{List(1, 2, 3)})
-    println(show(list))
+    println(run(list.show.toExpr))
     println(run(list))
 
     val opt = bound('{Option(4)})
-    println(show(opt))
+    println(run(opt.show.toExpr))
     println(run(opt))
 
     val map = bound('{Map(4 -> 1)})
-    println(show(map))
+    println(run(map.show.toExpr))
     println(run(map))
   }
 

tests/run-with-compiler/i5965.scala

@@ -9,15 +9,15 @@ object Test {
 
     '[List]
     val list = bound('{List(1, 2, 3)})
-    println(show(list))
+    println(run(list.show.toExpr))
     println(run(list))
 
     val opt = bound('{Option(4)})
-    println(show(opt))
+    println(run(opt.show.toExpr))
     println(run(opt))
 
     val map = bound('{Map(4 -> 1)})
-    println(show(map))
+    println(run(map.show.toExpr))
     println(run(map))
   }
 

tests/run-with-compiler/i5965b.scala

@@ -3,6 +3,6 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val v = '{ (if true then Some(1) else None).map(v => v+1) }
-    println(show(v))
+    println(run(v.show.toExpr))
   }
 }

tests/run-with-compiler/i5997.scala

@@ -1,8 +1,9 @@
-import quoted._
+import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
+    def show(expr: Expr[_]): String = run(expr.show.toExpr)
     println(show(('{ () => x(0) }).apply()))
     println(show(('{ (x1: Int) => x1 }).apply('{x(1)})))
     println(show(('{ (x1: Int, x2: Int) => x1 + x2 }).apply('{x(1)}, '{x(2)})))

tests/run-with-compiler/quote-function-applied-to.scala

@@ -12,7 +12,7 @@ object Test {
         '{ y + $b }
       }
     }
-    println(show(x))
+    println(run(x.show.toExpr))
   }
 
 }

tests/run-with-compiler/quote-macro-in-splice/quoted_2.scala

@@ -4,6 +4,6 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = '{ '{3} }
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/quote-nested-1.scala

@@ -9,6 +9,6 @@ object Test {
       '{${a}}
     }
 
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/quote-nested-2.scala

@@ -14,6 +14,6 @@ object Test {
       x
     }
 
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/quote-nested-3.scala

@@ -9,6 +9,6 @@ object Test {
       t
     }
 
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/quote-nested-4.scala

@@ -12,6 +12,6 @@ object Test {
 
     }
 
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 }

tests/run-with-compiler/quote-nested-5.scala

@@ -5,7 +5,7 @@ object Test {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = f
     println(run(q))
-    println(show(q))
+    println(run(q.show.toExpr))
   }
 
   def f: Expr[Int] = '{

tests/run-with-compiler/quote-owners.scala

@@ -10,10 +10,10 @@ object Test {
       else if (n % 2 == 0) '{ { val y = $x * $x; ${powerCode(n / 2, 'y)} } }
       else '{ $x * ${powerCode(n - 1, x)} }
 
-    println(show(powerCode(0, '{5})))
-    println(show(powerCode(1, '{5})))
-    println(show(powerCode(2, '{5})))
-    println(show(powerCode(3, '{5})))
-    println(show(powerCode(22, '{5})))
+    println(run(powerCode(0, '{5}).show.toExpr))
+    println(run(powerCode(1, '{5}).show.toExpr))
+    println(run(powerCode(2, '{5}).show.toExpr))
+    println(run(powerCode(3, '{5}).show.toExpr))
+    println(run(powerCode(22, '{5}).show.toExpr))
   }
 }

tests/run-with-compiler/quote-run-2.scala

@@ -7,7 +7,7 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     def runAndPrint[T](expr: Expr[T]): Unit = println(run(expr))
-    def showAndPrint[T](expr: Expr[T]): Unit = println(show(expr))
+    def show[T](expr: Expr[T]): Unit = println(run(expr.show.toExpr))
 
     runAndPrint(true)
     runAndPrint('a')
@@ -24,20 +24,20 @@ object Test {
 
     println("======")
 
-    showAndPrint(true)
-    showAndPrint('a')
-    showAndPrint('\n')
-    showAndPrint('"')
-    showAndPrint('\'')
-    showAndPrint('\\')
-    showAndPrint(1)
-    showAndPrint(2)
-    showAndPrint(3L)
-    showAndPrint(4.0f)
-    showAndPrint(5.0d)
-    showAndPrint("xyz")
-    showAndPrint("\n\\\"'")
-    showAndPrint("""abc
+    show(true)
+    show('a')
+    show('\n')
+    show('"')
+    show('\'')
+    show('\\')
+    show(1)
+    show(2)
+    show(3L)
+    show(4.0f)
+    show(5.0d)
+    show("xyz")
+    show("\n\\\"'")
+    show("""abc
          xyz""")
   }
 }