Skip to content

Commit 674e3e1

Browse files
authored
Merge pull request #174 from scala/backport-lts-3.3-22326
Backport "Copyright 2025" to 3.3 LTS
2 parents 583a05d + 3d18e3a commit 674e3e1

File tree

4 files changed

+3
-34
lines changed

4 files changed

+3
-34
lines changed

Diff for: compiler/src/dotty/tools/dotc/CompilationUnit.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ object CompilationUnit {
131131
unit1
132132
}
133133

134-
/** Create a compilation unit corresponding to an in-memory String.
134+
/** Create a compilation unit corresponding to an in-memory String.
135135
* Used for `compiletime.testing.typeChecks`.
136136
*/
137137
def apply(name: String, source: String)(using Context): CompilationUnit = {
138138
val src = SourceFile.virtual(name = name, content = source, maybeIncomplete = false)
139-
new CompilationUnit(src, null)
139+
new CompilationUnit(src)
140140
}
141141

142142
/** Create a compilation unit corresponding to `source`.

Diff for: compiler/src/dotty/tools/dotc/core/Phases.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ object Phases {
210210
private var myPostTyperPhase: Phase = _
211211
private var mySbtExtractDependenciesPhase: Phase = _
212212
private var myPicklerPhase: Phase = _
213-
private var mySetRootTreePhase: Phase = uninitialized
213+
private var mySetRootTreePhase: Phase = _
214214
private var myInliningPhase: Phase = _
215215
private var myStagingPhase: Phase = _
216216
private var mySplicingPhase: Phase = _

Diff for: tests/neg/i22320.check

-12
This file was deleted.

Diff for: tests/neg/i22320.scala

-19
This file was deleted.

0 commit comments

Comments
 (0)