Skip to content

Commit 2ba130a

Browse files
committed
Upgrade to scala-library 2.13.1
This allows us to revert 3d13696 and 71a022c.
1 parent 16d507d commit 2ba130a

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,13 @@ object Trees {
362362
val nameStart =
363363
if (point != span.start) point
364364
else {
365-
// Use an immutable ArraySeq to work around https://github.com/scala/bug/issues/11708
366-
val content = collection.immutable.ArraySeq.unsafeWrapArray(source.content())
367-
368365
// Point might be too far away from start to be recorded. In this case we fall back to scanning
369366
// forwards from the start offset for the name.
370367
// Note: This might be inaccurate since scanning might hit accidentally the same
371368
// name (e.g. in a comment) before finding the real definition.
372369
// To make this behavior more robust we'd have to change the trees for definitions to contain
373370
// a fully positioned Ident in place of a name.
374-
val idx = content.indexOfSlice(realName, point)
371+
val idx = source.content().indexOfSlice(realName, point)
375372
if (idx >= 0) idx
376373
else point // use `point` anyway. This is important if no source exists so scanning fails
377374
}

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ object Build {
7777
* scala-library.
7878
*/
7979
def stdlibVersion(implicit mode: Mode): String = mode match {
80-
case NonBootstrapped => "2.13.0"
81-
case Bootstrapped => "2.13.0"
80+
case NonBootstrapped => "2.13.1"
81+
case Bootstrapped => "2.13.1"
8282
}
8383

8484
val dottyOrganization = "ch.epfl.lamp"

0 commit comments

Comments
 (0)