From 02e273e23f8210531aa5d14087da721ed1fbe390 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 23 Jan 2020 11:42:47 +0100 Subject: [PATCH] Move scala.TupleXXL to scala.runtime.TupleXXL --- compiler/src/dotty/tools/dotc/core/Definitions.scala | 2 +- library/src/scala/internal/TupledFunction.scala | 2 ++ library/src/scala/{ => runtime}/TupleXXL.scala | 2 +- tests/run-staging/staged-tuples/StagedTuple.scala | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) rename library/src/scala/{ => runtime}/TupleXXL.scala (98%) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 1268bdfde6ce..04c1ba81b08e 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -749,7 +749,7 @@ class Definitions { lazy val NonEmptyTuple_tail: Symbol = NonEmptyTupleClass.requiredMethod("tail") @tu lazy val PairClass: ClassSymbol = ctx.requiredClass("scala.*:") - @tu lazy val TupleXXLClass: ClassSymbol = ctx.requiredClass("scala.TupleXXL") + @tu lazy val TupleXXLClass: ClassSymbol = ctx.requiredClass("scala.runtime.TupleXXL") def TupleXXLModule(implicit ctx: Context): Symbol = TupleXXLClass.companionModule def TupleXXL_fromIterator(implicit ctx: Context): Symbol = TupleXXLModule.requiredMethod("fromIterator") diff --git a/library/src/scala/internal/TupledFunction.scala b/library/src/scala/internal/TupledFunction.scala index 7ea2030fb5c5..c31a6afd72d9 100644 --- a/library/src/scala/internal/TupledFunction.scala +++ b/library/src/scala/internal/TupledFunction.scala @@ -1,6 +1,8 @@ package scala package internal +import scala.runtime.TupleXXL + object TupledFunction { def tupledFunction0[F, G]: TupledFunction[F, G] = scala.TupledFunction[F, G]( diff --git a/library/src/scala/TupleXXL.scala b/library/src/scala/runtime/TupleXXL.scala similarity index 98% rename from library/src/scala/TupleXXL.scala rename to library/src/scala/runtime/TupleXXL.scala index 1122c8e8277c..c4d52ebcf57b 100644 --- a/library/src/scala/TupleXXL.scala +++ b/library/src/scala/runtime/TupleXXL.scala @@ -1,4 +1,4 @@ -package scala +package scala.runtime import java.util.Arrays.{deepEquals, deepHashCode} final class TupleXXL private (es: IArray[Object]) extends Product { diff --git a/tests/run-staging/staged-tuples/StagedTuple.scala b/tests/run-staging/staged-tuples/StagedTuple.scala index 7455af47ea5e..477f6a65a235 100644 --- a/tests/run-staging/staged-tuples/StagedTuple.scala +++ b/tests/run-staging/staged-tuples/StagedTuple.scala @@ -2,6 +2,8 @@ package scala.internal import scala.quoted._ +import scala.runtime.TupleXXL + object StagedTuple { import Tuple.Concat import Tuple.Head