Skip to content

Commit 2df5dbb

Browse files
authored
Merge pull request #10224 from dotty-staging/remove-tasty-todo
TreeUnpickler: remove old syntax
2 parents f2d546c + 8f9f043 commit 2df5dbb

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

+4-7
Original file line numberDiff line numberDiff line change
@@ -981,18 +981,15 @@ class TreeUnpickler(reader: TastyReader,
981981
assert(sourcePathAt(start).isEmpty)
982982
readByte()
983983
readEnd()
984-
val importGiven = nextByte == GIVEN // TODO: drop the next time we bump Tasty versions
985-
if (importGiven) readByte()
986984
val expr = readTerm()
987-
setSpan(start, Import(expr, readSelectors(importGiven)))
985+
setSpan(start, Import(expr, readSelectors()))
988986
}
989-
def readSelectors(givenPrefix: Boolean)(using Context): List[untpd.ImportSelector] =
987+
def readSelectors()(using Context): List[untpd.ImportSelector] =
990988
if nextByte == IMPORTED then
991989
val start = currentAddr
992990
assert(sourcePathAt(start).isEmpty)
993991
readByte()
994-
var name = readName()
995-
if givenPrefix && name == nme.WILDCARD then name = EmptyTermName
992+
val name = readName()
996993
val from = setSpan(start, untpd.Ident(name))
997994
val selector = nextByte match
998995
case RENAMED =>
@@ -1007,7 +1004,7 @@ class TreeUnpickler(reader: TastyReader,
10071004
untpd.ImportSelector(from, EmptyTree, bound)
10081005
case _ =>
10091006
untpd.ImportSelector(from)
1010-
selector :: readSelectors(givenPrefix)
1007+
selector :: readSelectors()
10111008
else
10121009
Nil
10131010

0 commit comments

Comments
 (0)