Skip to content

Commit 4eb5f7b

Browse files
committed
Upgrade to Scala 3.7.1.
1 parent 26bae5f commit 4eb5f7b

File tree

8 files changed

+11
-10
lines changed

8 files changed

+11
-10
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import sbt.internal.util.ManagedLogger
33

44
import org.scalajs.jsenv.nodejs.NodeJSEnv
55

6-
val usedScalaCompiler = "3.6.2"
6+
val usedScalaCompiler = "3.7.1"
77
val usedTastyRelease = usedScalaCompiler
8-
val scala2Version = "2.13.14"
8+
val scala2Version = "2.13.16"
99

1010
val SourceDeps = config("sourcedeps").hide
1111

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
44

tasty-query/shared/src/main/scala/tastyquery/reader/classfiles/ClassfileParser.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ private[reader] object ClassfileParser {
140140
val bytesArrArg = scalaSigAnnotation.values.head._2.asInstanceOf[AnnotationValue.Arr]
141141
val idxs = bytesArrArg.values.map(_.asInstanceOf[AnnotationValue.Const].valueIdx)
142142
pool.sigbytes(idxs)
143+
case _: SimpleName => failNoAnnot()
143144
}
144145
Unpickler.loadInfo(sigBytes)
145146
}

tasty-query/shared/src/main/scala/tastyquery/reader/pickles/PickleReader.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ private[pickles] class PickleReader {
3131
private var frozenSymbols: Boolean = false
3232

3333
/** The map from created local symbols to the address of their info, until it gets read. */
34-
private val localSymbolInfoRefs = mutable.AnyRefMap.empty[TermOrTypeSymbol, Int]
34+
private val localSymbolInfoRefs = mutable.HashMap.empty[TermOrTypeSymbol, Int]
3535

36-
private val localClassGivenSelfTypeRefs = mutable.AnyRefMap.empty[ClassSymbol, Int]
36+
private val localClassGivenSelfTypeRefs = mutable.HashMap.empty[ClassSymbol, Int]
3737

3838
final class Structure(using val myEntries: Entries, val myIndex: Index):
3939
def allRegisteredSymbols: Iterator[TermOrTypeSymbol] =

tasty-query/shared/src/main/scala/tastyquery/reader/pickles/Unpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private[reader] object Unpickler {
4242
}
4343

4444
// Read the annotations to give to the symbols we read
45-
val annotationMap = mutable.AnyRefMap.empty[TermOrTypeSymbol, List[Annotation]]
45+
val annotationMap = mutable.HashMap.empty[TermOrTypeSymbol, List[Annotation]]
4646
index.loopWithIndices { (offset, i) =>
4747
if reader.isSymbolAnnotationEntry(i) then
4848
pkl.unsafeFork(offset) {

tasty-query/shared/src/main/scala/tastyquery/reader/tasties/TastyFormat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private[tasties] object TastyFormat:
296296
* compatibility, but remains backwards compatible, with all
297297
* preceeding `MinorVersion`.
298298
*/
299-
final val MinorVersion: Int = 6
299+
final val MinorVersion: Int = 7
300300

301301
/** Natural Number. The `ExperimentalVersion` allows for
302302
* experimentation with changes to TASTy without committing

tasty-query/shared/src/main/scala/tastyquery/reader/tasties/TreeUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ private[tasties] object TreeUnpickler {
18061806
*
18071807
* This is used in `readWithin` to resolve top-level class references without a Context.
18081808
*/
1809-
val declaredTopLevelClasses = mutable.AnyRefMap.empty[(PackageSymbol, TypeName), ClassSymbol]
1809+
val declaredTopLevelClasses = mutable.HashMap.empty[(PackageSymbol, TypeName), ClassSymbol]
18101810

18111811
def hasSymbolAt(addr: Addr): Boolean = localSymbols.contains(addr)
18121812

tasty-query/shared/src/test/scala/tastyquery/PrintersTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class PrintersTest extends UnrestrictedUnpicklingSuite:
229229
testShowBasicMember(
230230
MatchTypeClass,
231231
typeName("MTWithBind"),
232-
"type MTWithBind[X] <: t = X match { case List[t] => t }"
232+
"type MTWithBind[X] = X match { case List[t] => t }"
233233
)
234234
}
235235

@@ -315,7 +315,7 @@ class PrintersTest extends UnrestrictedUnpicklingSuite:
315315
testShowMultilineMember(
316316
MatchTypeClass,
317317
typeName("MTWithBind"),
318-
"""type MTWithBind[X] <: t = X match {
318+
"""type MTWithBind[X] = X match {
319319
| case List[t] => t
320320
|}""".stripMargin
321321
)

0 commit comments

Comments
 (0)