diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala b/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala index 80d5c543547b..f4e945ae2667 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala +++ b/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala @@ -10,9 +10,7 @@ import java.nio.file.{Path, Files, Paths, FileSystems} object Main extends App { val inspector = new TastyInspector { - protected def processCompilationUnit(using Quotes)(root: qctx.reflect.Tree): Unit = { - - import qctx.reflect._ + protected def processCompilationUnit(using Quotes)(root: quotes.reflect.Tree): Unit = { val tastyStr = root.show println(tastyStr) } diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala index 4f7bdaa43efa..311c27cc4c56 100644 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala +++ b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala @@ -5,8 +5,8 @@ object Macro { inline def f(): Unit = ${ macroImplementation } def macroImplementation(using Quotes): Expr[Unit] = { - import qctx.reflect._ - error("some error", rootPosition) + import quotes.reflect._ + Reporting.error("some error", Position.ofMacroExpansion) '{ println("Implementation in MacroCompileError") } } diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala index c0f1eb93795f..71d12b8d6d7f 100644 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala +++ b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala @@ -3,8 +3,8 @@ import scala.quoted._ object MacroRuntime { def impl()(using Quotes): Expr[Unit] = { - import qctx.reflect._ - error("some error", rootPosition) + import quotes.reflect._ + Reporting.error("some error", Position.ofMacroExpansion) '{ println("Implementation in MacroCompileError") } } diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test index bf2c8effa3bd..3799f31d477a 100644 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test +++ b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test @@ -3,6 +3,7 @@ $ copy-file changes/MacroRuntime.scala MacroRuntime.scala # use an implemntation of the macro that emits a compile time error $ copy-file changes/MacroRuntimeCompileError.scala MacroRuntime.scala +> clean -> compile $ copy-file changes/MacroRuntime.scala MacroRuntime.scala @@ -10,4 +11,5 @@ $ copy-file changes/MacroRuntime.scala MacroRuntime.scala > compile $ copy-file changes/MacroRuntimeRuntimeError.scala MacroRuntime.scala +> clean -> run