Merge pull request #6866 from dotty-staging/move-typeChecks-macro-to-compiletime

liufengyun · web-flow · commit 4545f3a70ae7 · 2019-07-17T14:02:20.000+02:00
Move typeChecks macro to compiletime package
diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
@@ -1 +1 @@
-Subproject commit 22077993ae02467636f87b078713eba21ceb3dbd
+Subproject commit e5c93c3dc97788cc4d4e12e01349962fdd60cf43
diff --git a/library/src-bootstrapped/scala/compiletime/testing/typeChecks.scala b/library/src-bootstrapped/scala/compiletime/testing/typeChecks.scala
@@ -1,4 +1,4 @@
-package scala.testing
+package scala.compiletime.testing
 
 import scala.quoted._
 
diff --git a/library/src-non-bootstrapped/scala/compiletime/testing/typeChecks.scala b/library/src-non-bootstrapped/scala/compiletime/testing/typeChecks.scala
@@ -1,4 +1,4 @@
-package scala.testing
+package scala.compiletime.testing
 
 inline def typeChecks(inline code: String): Boolean =
   scala.compiletime.error("Cannot expand typeChecks while bootstrapping the compiler")
diff --git a/tests/run-with-compiler/reflect-inline/test_2.scala b/tests/run-with-compiler/reflect-inline/test_2.scala
@@ -4,7 +4,7 @@ object Test {
   def main(args: Array[String]): Unit = {
     val a: String = "5"
     assert(typeChecks("|1 + 1".stripMargin))
-    assert(scala.testing.typeChecks("|1 + 1".stripMargin))
+    assert(scala.compiletime.testing.typeChecks("|1 + 1".stripMargin))
     assert(("|3 + " + a).stripMargin == "3 + 5")
   }
 }
diff --git a/tests/run-with-compiler/scala-tests-typeChecks.scala b/tests/run-with-compiler/scala-tests-typeChecks.scala
@@ -1,4 +1,4 @@
-import scala.testing._
+import scala.compiletime.testing._
 
 object Test {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package scala.testing`
	`1`	`+package scala.compiletime.testing`
`2`	`2`
`3`	`3`	`import scala.quoted._`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ object Test {`
`4`	`4`	`def main(args: Array[String]): Unit = {`
`5`	`5`	`val a: String = "5"`
`6`	`6`	`assert(typeChecks("\|1 + 1".stripMargin))`
`7`		`- assert(scala.testing.typeChecks("\|1 + 1".stripMargin))`
	`7`	`+ assert(scala.compiletime.testing.typeChecks("\|1 + 1".stripMargin))`
`8`	`8`	`assert(("\|3 + " + a).stripMargin == "3 + 5")`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import scala.testing._`
	`1`	`+import scala.compiletime.testing._`
`2`	`2`
`3`	`3`	`object Test {`
`4`	`4`