Skip to content

Commit a9e3eab

Browse files
committed
Address comments
1 parent 92e7cf8 commit a9e3eab

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

library/src-bootstrapped/scala/Tuple.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scala
22
import annotation.showAsInfix
33
import compiletime._
4+
import internal._
45

56
sealed trait Tuple extends Any {
67
import Tuple._
@@ -346,6 +347,7 @@ sealed class *:[+H, +T <: Tuple] extends NonEmptyTuple
346347

347348
object *: {
348349
inline def unapply[H, T <: Tuple](x: H *: T) =
350+
// With stageIt on we cannot expand x.head in the same run and fails
349351
if (Tuple.stageIt) (scala.runtime.DynamicTuple.dynamicHead(x), scala.runtime.DynamicTuple.dynamicTail(x))
350352
else (x.head, x.tail)
351353
}

library/src-bootstrapped/scala/compiletime/StagedTuple.scala renamed to library/src-bootstrapped/scala/internal/StagedTuple.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.compiletime
1+
package scala.internal
22

33
import scala.quoted._
44

@@ -131,7 +131,7 @@ object StagedTuple {
131131
if (!specialize) '{dynamicApply($tup, $n)}
132132
else {
133133
def fallbackApply(): Expr[Elem[Tup, N]] = nValue match {
134-
case Some(n) => quoted.QuoteError("index out of bounds: " + n, tup)
134+
case Some(n) => QuoteError("index out of bounds: " + n, tup)
135135
case None => '{dynamicApply($tup, $n)}
136136
}
137137
val res = size match {

0 commit comments

Comments
 (0)