Skip to content

Commit 74e8fbc

Browse files
committed
Merge branch 'main' into jsr45
2 parents cc1b09b + 7bd8590 commit 74e8fbc

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

compiler/src/dotty/tools/dotc/Compiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Compiler {
3636
List(new Parser) :: // Compiler frontend: scanner, parser
3737
List(new TyperPhase) :: // Compiler frontend: namer, typer
3838
List(new CheckUnused.PostTyper) :: // Check for unused elements
39-
//List(new YCheckPositions) :: // YCheck positions
39+
// List(new YCheckPositions) :: // YCheck positions
4040
List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
4141
List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
4242
List(new PostTyper) :: // Additional checks and cleanups after type checking

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ object Trees {
13551355
def Quote(tree: Tree)(body: Tree, tags: List[Tree])(using Context): Quote = tree match {
13561356
case tree: Quote if (body eq tree.body) && (tags eq tree.tags) => tree
13571357
case _ => finalize(tree, untpd.Quote(body, tags)(sourceFile(tree)))
1358-
}
1358+
}
13591359
def Splice(tree: Tree)(expr: Tree)(using Context): Splice = tree match {
13601360
case tree: Splice if (expr eq tree.expr) => tree
13611361
case _ => finalize(tree, untpd.Splice(expr)(sourceFile(tree)))

compiler/src/dotty/tools/dotc/inlines/Inlines.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ object Inlines:
256256
else
257257
cpy.Block(inlined)(inlined.bindings, inlined.expansion)
258258

259-
260-
261259
/** Leave only a call trace consisting of
262260
* - a reference to the top-level class from which the call was inlined,
263261
* - the call's position

0 commit comments

Comments
 (0)