Skip to content

Backport "Copyright 2025" to 3.3 LTS #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/CompilationUnit.scala
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ object CompilationUnit {
unit1
}

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

/** Create a compilation unit corresponding to `source`.
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/Phases.scala
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ object Phases {
private var myPostTyperPhase: Phase = _
private var mySbtExtractDependenciesPhase: Phase = _
private var myPicklerPhase: Phase = _
private var mySetRootTreePhase: Phase = uninitialized
private var mySetRootTreePhase: Phase = _
private var myInliningPhase: Phase = _
private var myStagingPhase: Phase = _
private var mySplicingPhase: Phase = _
Expand Down
5 changes: 5 additions & 0 deletions compiler/test-resources/repl/init-script-flag
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
scala>:reset --repl-init-script:'println("Hello from init script!")'
Resetting REPL state with the following settings:
--repl-init-script:println("Hello from init script!")

Hello from init script!
12 changes: 0 additions & 12 deletions tests/neg/i22320.check

This file was deleted.

19 changes: 0 additions & 19 deletions tests/neg/i22320.scala

This file was deleted.

Loading