Skip to content

Commit b3371c9

Browse files
Merge branch 'main' into fix/flexible-types-scaladoc-2m
2 parents 7214a85 + 74f78a1 commit b3371c9

File tree

1,363 files changed

+108076
-4316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,363 files changed

+108076
-4316
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Any changes to the Scala 3 Standard Library must be approve
2+
# by one of the officers responsible of maintaining it
3+
/library/ @scala/stdlib-officers
4+
/library-aux/ @scala/stdlib-officers
5+
/library-js/ @scala/stdlib-officers

.github/workflows/cla.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
check:
88
runs-on: ubuntu-latest
9+
if: github.event.pull_request.user.login != 'dependabot'
910
steps:
1011
- name: Verify CLA
1112
uses: scala/cla-checker@v1

.github/workflows/lts-backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- uses: coursier/cache-action@v6
19-
- uses: VirtusLab/[email protected].0
19+
- uses: VirtusLab/[email protected].4
2020
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2121
env:
2222
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/stdlib.yaml

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
name: Compile Full Standard Library
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
pull_request:
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
scala-library-nonbootstrapped:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Git Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: 17
24+
cache: 'sbt'
25+
26+
- uses: sbt/setup-sbt@v1
27+
- name: Compile `scala-library-nonbootstrapped`
28+
run: ./project/scripts/sbt scala-library-nonbootstrapped/compile
29+
30+
scala3-library-nonbootstrapped:
31+
runs-on: ubuntu-latest
32+
##needs: [scala-library-nonbootstrapped] Add when we add support for caching here
33+
steps:
34+
- name: Git Checkout
35+
uses: actions/checkout@v4
36+
37+
- name: Set up JDK 17
38+
uses: actions/setup-java@v4
39+
with:
40+
distribution: 'temurin'
41+
java-version: 17
42+
cache: 'sbt'
43+
44+
- uses: sbt/setup-sbt@v1
45+
- name: Compile `scala3-library-nonbootstrapped`
46+
run: ./project/scripts/sbt scala3-library-nonbootstrapped/compile
47+
48+
scala-library-bootstrapped:
49+
runs-on: ubuntu-latest
50+
needs : [scala3-compiler-nonbootstrapped, scala3-sbt-bridge-nonbootstrapped, scala-library-nonbootstrapped, scala3-library-nonbootstrapped]
51+
steps:
52+
- name: Git Checkout
53+
uses: actions/checkout@v4
54+
55+
- name: Set up JDK 17
56+
uses: actions/setup-java@v4
57+
with:
58+
distribution: 'temurin'
59+
java-version: 17
60+
cache: 'sbt'
61+
62+
- uses: sbt/setup-sbt@v1
63+
- name: Compile `scala-library-bootstrapped`
64+
run: ./project/scripts/sbt scala-library-bootstrapped/compile
65+
66+
scala3-library-bootstrapped:
67+
runs-on: ubuntu-latest
68+
##needs: [scala-library-bootstrapped] Add when we add support for caching here
69+
steps:
70+
- name: Git Checkout
71+
uses: actions/checkout@v4
72+
73+
- name: Set up JDK 17
74+
uses: actions/setup-java@v4
75+
with:
76+
distribution: 'temurin'
77+
java-version: 17
78+
cache: 'sbt'
79+
80+
- uses: sbt/setup-sbt@v1
81+
- name: Compile `scala3-library-bootstrapped`
82+
run: ./project/scripts/sbt scala3-library-bootstrapped-new/compile
83+
84+
tasty-core-nonbootstrapped:
85+
runs-on: ubuntu-latest
86+
##needs: [scala3-library-nonbootstrapped] Add when we add support for caching here
87+
steps:
88+
- name: Git Checkout
89+
uses: actions/checkout@v4
90+
91+
- name: Set up JDK 17
92+
uses: actions/setup-java@v4
93+
with:
94+
distribution: 'temurin'
95+
java-version: 17
96+
cache: 'sbt'
97+
- uses: sbt/setup-sbt@v1
98+
- name: Compile `tasty-core-nonbootstrapped`
99+
run: ./project/scripts/sbt tasty-core-nonbootstrapped/compile
100+
101+
scala3-compiler-nonbootstrapped:
102+
runs-on: ubuntu-latest
103+
##needs: [tasty-core-nonbootstrapped, scala3-library-nonbootstrapped] Add when we add support for caching here
104+
steps:
105+
- name: Git Checkout
106+
uses: actions/checkout@v4
107+
108+
- name: Set up JDK 17
109+
uses: actions/setup-java@v4
110+
with:
111+
distribution: 'temurin'
112+
java-version: 17
113+
cache: 'sbt'
114+
- uses: sbt/setup-sbt@v1
115+
- name: Compile `scala3-compiler-nonbootstrapped`
116+
run: ./project/scripts/sbt scala3-compiler-nonbootstrapped/compile
117+
118+
scala3-sbt-bridge-nonbootstrapped:
119+
runs-on: ubuntu-latest
120+
##needs: [scala3-compiler-nonbootstrapped] Add when we add support for caching here
121+
steps:
122+
- name: Git Checkout
123+
uses: actions/checkout@v4
124+
125+
- name: Set up JDK 17
126+
uses: actions/setup-java@v4
127+
with:
128+
distribution: 'temurin'
129+
java-version: 17
130+
cache: 'sbt'
131+
- uses: sbt/setup-sbt@v1
132+
- name: Compile `scala3-sbt-bridge-nonbootstrapped`
133+
run: ./project/scripts/sbt scala3-sbt-bridge-nonbootstrapped/compile
134+
135+
tasty-core-bootstrapped:
136+
runs-on: ubuntu-latest
137+
##needs: [scala3-library-bootstrapped] Add when we add support for caching here
138+
steps:
139+
- name: Git Checkout
140+
uses: actions/checkout@v4
141+
142+
- name: Set up JDK 17
143+
uses: actions/setup-java@v4
144+
with:
145+
distribution: 'temurin'
146+
java-version: 17
147+
cache: 'sbt'
148+
- uses: sbt/setup-sbt@v1
149+
- name: Compile `tasty-core-bootstrapped`
150+
run: ./project/scripts/sbt tasty-core-bootstrapped-new/compile
151+
152+
scala3-compiler-bootstrapped:
153+
runs-on: ubuntu-latest
154+
##needs: [tasty-core-bootstrapped, scala3-library-bootstrapped] Add when we add support for caching here
155+
steps:
156+
- name: Git Checkout
157+
uses: actions/checkout@v4
158+
159+
- name: Set up JDK 17
160+
uses: actions/setup-java@v4
161+
with:
162+
distribution: 'temurin'
163+
java-version: 17
164+
cache: 'sbt'
165+
- uses: sbt/setup-sbt@v1
166+
- name: Compile `scala3-compiler-bootstrapped`
167+
run: ./project/scripts/sbt scala3-compiler-bootstrapped-new/compile
168+
169+
scala3-sbt-bridge-bootstrapped:
170+
runs-on: ubuntu-latest
171+
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
172+
steps:
173+
- name: Git Checkout
174+
uses: actions/checkout@v4
175+
176+
- name: Set up JDK 17
177+
uses: actions/setup-java@v4
178+
with:
179+
distribution: 'temurin'
180+
java-version: 17
181+
cache: 'sbt'
182+
- uses: sbt/setup-sbt@v1
183+
- name: Compile `scala3-sbt-bridge-bootstrapped`
184+
run: ./project/scripts/sbt scala3-sbt-bridge-bootstrapped/compile

build.sbt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
val scala3 = Build.scala3
2+
val `scala3-nonbootstrapped` = Build.`scala3-nonbootstrapped`
23
val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
4+
val `scala3-bootstrapped-new` = Build.`scala3-bootstrapped-new`
35
val `scala3-interfaces` = Build.`scala3-interfaces`
46
val `scala3-compiler` = Build.`scala3-compiler`
7+
val `scala3-compiler-nonbootstrapped` = Build.`scala3-compiler-nonbootstrapped`
8+
val `scala3-compiler-bootstrapped-new` = Build.`scala3-compiler-bootstrapped-new`
59
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
10+
val `scala-library-nonbootstrapped` = Build.`scala-library-nonbootstrapped`
11+
val `scala3-library-nonbootstrapped` = Build.`scala3-library-nonbootstrapped`
12+
val `scala-library-bootstrapped` = Build.`scala-library-bootstrapped`
13+
val `scala3-library-bootstrapped-new` = Build.`scala3-library-bootstrapped-new`
614
val `scala3-library` = Build.`scala3-library`
715
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
816
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
917
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
18+
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
19+
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
1020
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
1121
val `scala3-staging` = Build.`scala3-staging`
1222
val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`
@@ -19,6 +29,8 @@ val `scala2-library-tasty` = Build.`scala2-library-tasty`
1929
val `scala2-library-cc` = Build.`scala2-library-cc`
2030
val `scala2-library-cc-tasty` = Build.`scala2-library-cc-tasty`
2131
val `tasty-core` = Build.`tasty-core`
32+
val `tasty-core-nonbootstrapped` = Build.`tasty-core-nonbootstrapped`
33+
val `tasty-core-bootstrapped-new` = Build.`tasty-core-bootstrapped-new`
2234
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
2335
val `tasty-core-scala2` = Build.`tasty-core-scala2`
2436
val scaladoc = Build.scaladoc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class Compiler {
9292
new ExplicitSelf, // Make references to non-trivial self types explicit as casts
9393
new StringInterpolatorOpt, // Optimizes raw and s and f string interpolators by rewriting them to string concatenations or formats
9494
new DropBreaks) :: // Optimize local Break throws by rewriting them
95-
List(new PruneErasedDefs, // Drop erased definitions from scopes and simplify erased expressions
95+
List(new PruneErasedDefs, // Make erased symbols private
9696
new UninitializedDefs, // Replaces `compiletime.uninitialized` by `_`
9797
new InlinePatterns, // Remove placeholders of inlined patterns
9898
new VCInlineMethods, // Inlines calls to value class methods

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ extends ImplicitRunInfo, ConstraintRunInfo, cc.CaptureRunInfo {
367367
profiler.onPhase(phase):
368368
try units = phase.runOn(units)
369369
catch case _: InterruptedException => cancelInterrupted()
370-
if (ctx.settings.Xprint.value.containsPhase(phase))
370+
if (ctx.settings.Vprint.value.containsPhase(phase))
371371
for (unit <- units)
372372
def printCtx(unit: CompilationUnit) = phase.printingContext(
373373
ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))

0 commit comments

Comments
 (0)