Skip to content

Commit 1a942ea

Browse files
oderskynicolasstucki
authored andcommitted
Fix rebase breakage
1 parent b991e70 commit 1a942ea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

compiler/src/dotty/tools/dotc/typer/Inliner.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
879879
if (from.isEmpty) Some((caseBindings, cdef.body))
880880
else {
881881
val Block(stats, expr) = tpd.Block(caseBindings, cdef.body).subst(from, to)
882-
val typeDefs = to.collect { case sym if sym.name != tpnme.WILDCARD => tpd.TypeDef(sym).withPos(sym.pos) }
882+
val typeDefs = to.collect { case sym if sym.name != tpnme.WILDCARD => tpd.TypeDef(sym).withSpan(sym.span) }
883883
Some((typeDefs ::: stats.asInstanceOf[List[MemberDef]], expr))
884884
}
885885
}
@@ -963,7 +963,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
963963
// drop type ascriptions/casts hiding pattern-bound types (which are now aliases after reducing the match)
964964
// note that any actually necessary casts will be reinserted by the typing pass below
965965
val rhs1 = rhs0 match {
966-
case Block(stats, t) if t.pos.isSynthetic =>
966+
case Block(stats, t) if t.span.isSynthetic =>
967967
t match {
968968
case Typed(expr, _) =>
969969
Block(stats, expr)
@@ -1099,7 +1099,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
10991099
treeMap = {
11001100
case ident: Ident if ident.isType && typeBindingsSet.contains(ident.symbol) =>
11011101
val TypeAlias(r) = ident.symbol.info
1102-
TypeTree(r).withPos(ident.pos)
1102+
TypeTree(r).withSpan(ident.span)
11031103
case tree => tree
11041104
}
11051105
)

0 commit comments

Comments
 (0)