Fix rebase breakage and update Build

Author: odersky

project/Build.scala

@@ -1271,6 +1271,7 @@ object Build {
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/Patterns.scala"),
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/SplicedType.scala"),
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/StopMacroExpansion.scala"),
+        file(s"${baseDirectory.value}/src/scala/compiletime/Erased.scala"),
       )
     )
   lazy val `scala3-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(Bootstrapped)
@@ -1406,6 +1407,7 @@ object Build {
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/Patterns.scala"),
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/SplicedType.scala"),
         file(s"${baseDirectory.value}/src/scala/quoted/runtime/StopMacroExpansion.scala"),
+        file(s"${baseDirectory.value}/src/scala/compiletime/Erased.scala"),
       )
     )
 

tests/neg/erased-lazy-given.check

@@ -1,4 +1,4 @@
--- [E217] Type Error: tests/neg/erased-lazy-given.scala:8:13 -----------------------------------------------------------
+-- [E218] Type Error: tests/neg/erased-lazy-given.scala:8:13 -----------------------------------------------------------
 8 |  lazy given E = E() // error
   |             ^
   |             given instance given_E is implicitly `erased` since its type extends trait `compiletime.Erased`.

tests/neg/erased-lazy-val.check

@@ -1,17 +1,17 @@
--- [E217] Type Error: tests/neg/erased-lazy-val.scala:6:18 -------------------------------------------------------------
+-- [E218] Type Error: tests/neg/erased-lazy-val.scala:6:18 -------------------------------------------------------------
 6 |  erased lazy val i: Int = 1 // error
   |                  ^
   |                  `erased` is not allowed for this kind of definition.
   |
   | longer explanation available when compiling with `-explain`
--- [E217] Type Error: tests/neg/erased-lazy-val.scala:7:11 -------------------------------------------------------------
+-- [E218] Type Error: tests/neg/erased-lazy-val.scala:7:11 -------------------------------------------------------------
 7 |  lazy val e: E = E() // error
   |           ^
   |           lazy value e is implicitly `erased` since its type extends trait `compiletime.Erased`.
   |           But `erased` is not allowed for this kind of definition.
   |
   | longer explanation available when compiling with `-explain`
--- [E217] Type Error: tests/neg/erased-lazy-val.scala:8:2 --------------------------------------------------------------
+-- [E218] Type Error: tests/neg/erased-lazy-val.scala:8:2 --------------------------------------------------------------
 8 |  erased object obj1 // error
   |  ^
   |  `erased` is not allowed for this kind of definition.

tests/neg/erasedValueb.check

@@ -2,7 +2,7 @@
 7 |  foo0(erasedValue[Int]) // error
   |       ^^^^^^^^^^^
   |       method erasedValue is declared as `erased`, but is in fact used
--- [E216] Type Error: tests/neg/erasedValueb.scala:8:18 ----------------------------------------------------------------
+-- [E217] Type Error: tests/neg/erasedValueb.scala:8:18 ----------------------------------------------------------------
 8 |  foo1(erasedValue[Int]) // error
   |       ^^^^^^^^^^^^^^^^
   |       argument to an erased parameter fails to be a pure expression