Skip to content

Commit 90513d9

Browse files
authored
Merge pull request #2 from lampepfl/master
Update fork from original repo
2 parents 91fbe52 + a63b1d1 commit 90513d9

File tree

1,640 files changed

+21101
-18703
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,640 files changed

+21101
-18703
lines changed

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 5 additions & 0 deletions

.github/ISSUE_TEMPLATE/crash.md

Lines changed: 5 additions & 0 deletions

.github/ISSUE_TEMPLATE/other-issue.md

Lines changed: 5 additions & 1 deletion

.github/workflows/ci.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dotty CI
1+
name: Dotty
22

33
on:
44
push:
@@ -241,14 +241,11 @@ jobs:
241241
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
242242
- ${{ github.workspace }}/../../cache/general:/root/.cache
243243
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
244-
|| (
245-
github.event_name == 'push'
246-
&& startsWith(github.event.ref, 'refs/tags/')
247-
)
244+
|| github.event_name == 'push'
248245
|| (
249246
github.event_name == 'pull_request'
250247
&& !contains(github.event.pull_request.body, '[skip ci]')
251-
&& contains(github.event.pull_request.body, '[test_sbt]')
248+
&& !contains(github.event.pull_request.body, '[skip test_sbt]')
252249
)"
253250

254251
steps:

.github/workflows/scala3doc.yaml renamed to .github/workflows/scaladoc.yaml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI for Scala3doc
1+
name: scaladoc
22

33
on:
44
push:
@@ -8,7 +8,12 @@ jobs:
88
env:
99
AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
1010
runs-on: ubuntu-latest
11-
if: "github.event_name == 'pull_request' || contains(github.event.ref, 'scala3doc') || contains(github.event.ref, 'master')"
11+
if: "( github.event_name == 'pull_request'
12+
&& !contains(github.event.pull_request.body, '[skip ci]')
13+
&& !contains(github.event.pull_request.body, '[skip docs]')
14+
)
15+
|| contains(github.event.ref, 'scaladoc')
16+
|| contains(github.event.ref, 'master')"
1217

1318
steps:
1419
- name: Git Checkout
@@ -31,25 +36,25 @@ jobs:
3136
java-version: 11
3237

3338
- name: Compile and test
34-
run: ./project/scripts/sbt scala3doc/test
39+
run: ./project/scripts/sbt scaladoc/test
3540

3641
- name: Locally publish self
37-
run: ./project/scripts/sbt scala3doc/publishLocal
42+
run: ./project/scripts/sbt scaladoc/publishLocal
3843

3944
- name: Generate self documentation
40-
run: ./project/scripts/sbt scala3doc/generateSelfDocumentation
45+
run: ./project/scripts/sbt scaladoc/generateSelfDocumentation
4146

4247
- name: Generate testcases documentation
43-
run: ./project/scripts/sbt scala3doc/generateTestcasesDocumentation
48+
run: ./project/scripts/sbt scaladoc/generateTestcasesDocumentation
4449

4550
- name: Generate Scala 3 documentation
46-
run: ./project/scripts/sbt scala3doc/generateScala3Documentation
51+
run: ./project/scripts/sbt scaladoc/generateScalaDocumentation
4752

4853
- name: Generate documentation for example project using dotty-sbt
49-
run: ./project/scripts/sbt "sbt-dotty/scripted sbt-dotty/scala3doc"
54+
run: ./project/scripts/sbt "sbt-dotty/scripted sbt-dotty/scaladoc"
5055

5156
- name: Generate index file
52-
run: scala3doc/scripts/mk-index.sh scala3doc/output > scala3doc/output/index.html
57+
run: scaladoc/scripts/mk-index.sh scaladoc/output > scaladoc/output/index.html
5358

5459
- name: Upload documentation to server
5560
uses: azure/CLI@v1
@@ -61,13 +66,19 @@ jobs:
6166
DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}
6267
echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
6368
az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
64-
az storage blob sync -s scala3doc/output -c $DOC_DEST --account-name scala3docstorage
69+
az storage blob sync -s scaladoc/output -c $DOC_DEST --account-name scala3docstorage
6570
6671
community-docs:
6772
env:
6873
AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
6974
runs-on: ubuntu-latest
70-
if: "github.event_name == 'pull_request' || contains(github.event.ref, 'scala3doc') || contains(github.event.ref, 'master')"
75+
if: "( github.event_name == 'pull_request'
76+
&& !contains(github.event.pull_request.body, '[skip ci]')
77+
&& !contains(github.event.pull_request.body, '[skip docs]')
78+
)
79+
|| contains(github.event.ref, 'scaladoc')
80+
|| contains(github.event.ref, 'scala3doc')
81+
|| contains(github.event.ref, 'master')"
7182

7283
steps:
7384
- name: Git Checkout

.gitmodules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,10 @@
174174
[submodule "community-build/community-projects/scalatestplus-junit"]
175175
path = community-build/community-projects/scalatestplus-junit
176176
url = https://github.com/dotty-staging/scalatestplus-junit.git
177+
[submodule "community-build/community-projects/izumi-reflect"]
178+
path = community-build/community-projects/izumi-reflect
179+
url = https://github.com/dotty-staging/izumi-reflect.git
180+
[submodule "community-build/community-projects/perspective"]
181+
path = community-build/community-projects/perspective
182+
url = https://github.com/dotty-staging/perspective.git
183+
branch = dotty/nightly

README.md

Lines changed: 1 addition & 1 deletion

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Apply.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Apply {
2121

2222
@Benchmark
2323
def tupleApply(): Any = {
24-
runtime.Tuple.apply(tuple, index)
24+
runtime.Tuples.apply(tuple, index)
2525
}
2626

2727
@Benchmark

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Concat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ class Concat {
2727

2828
@Benchmark
2929
def tupleConcat(): Tuple = {
30-
runtime.Tuple.concat(tuple1, tuple2)
30+
runtime.Tuples.concat(tuple1, tuple2)
3131
}
3232
}

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Cons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Cons {
2323

2424
@Benchmark
2525
def tupleCons(): Tuple = {
26-
runtime.Tuple.cons("elem", tuple)
26+
runtime.Tuples.cons("elem", tuple)
2727
}
2828

2929
@Benchmark

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Conversions.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ class Conversions {
2323

2424
@Benchmark
2525
def tupleToArray(): Array[Object] = {
26-
runtime.Tuple.toArray(tuple)
26+
runtime.Tuples.toArray(tuple)
2727
}
2828

2929
@Benchmark
3030
def tupleToIArray(): IArray[Object] = {
31-
runtime.Tuple.toIArray(tuple)
31+
runtime.Tuples.toIArray(tuple)
3232
}
3333

3434
@Benchmark
3535
def tupleFromArray(): Tuple = {
36-
runtime.Tuple.fromArray(array)
36+
runtime.Tuples.fromArray(array)
3737
}
3838

3939
@Benchmark
4040
def tupleFromIArray(): Tuple = {
41-
runtime.Tuple.fromIArray(iarray)
41+
runtime.Tuples.fromIArray(iarray)
4242
}
4343

4444
@Benchmark
4545
def productToArray(): Array[Object] = {
46-
runtime.Tuple.productToArray(tuple.asInstanceOf[Product])
46+
runtime.Tuples.productToArray(tuple.asInstanceOf[Product])
4747
}
4848

4949
@Benchmark

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Map.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Map {
2929

3030
@Benchmark
3131
def tupleMap(): Tuple = {
32-
runtime.Tuple.map[Id](tuple, [T] => (x:T) => x.asInstanceOf[String].updated(0, 'a').asInstanceOf[T])
32+
runtime.Tuples.map[Id](tuple, [T] => (x:T) => x.asInstanceOf[String].updated(0, 'a').asInstanceOf[T])
3333
}
3434

3535
@Benchmark

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Tail.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Tail {
2121

2222
@Benchmark
2323
def tupleTail(): Tuple = {
24-
runtime.Tuple.tail(tuple)
24+
runtime.Tuples.tail(tuple)
2525
}
2626

2727
@Benchmark

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Zip.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Zip {
2727

2828
@Benchmark
2929
def tupleZip(): Tuple = {
30-
runtime.Tuple.zip(tuple1, tuple2)
30+
runtime.Tuples.zip(tuple1, tuple2)
3131
}
3232

3333
@Benchmark

bench-run/src/main/scala/tuples/Drop.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Drop {
2323

2424
@Benchmark
2525
def tupleDrop(): Tuple = {
26-
runtime.Tuple.drop(tuple, half)
26+
runtime.Tuples.drop(tuple, half)
2727
}
2828

2929
@Benchmark

bench-run/src/main/scala/tuples/Split.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Split {
2323

2424
@Benchmark
2525
def tupleSplit(): (Tuple, Tuple) = {
26-
runtime.Tuple.splitAt(tuple, half)
26+
runtime.Tuples.splitAt(tuple, half)
2727
}
2828

2929
@Benchmark

bench-run/src/main/scala/tuples/Take.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Take {
2323

2424
@Benchmark
2525
def tupleTake(): Tuple = {
26-
runtime.Tuple.take(tuple, half)
26+
runtime.Tuples.take(tuple, half)
2727
}
2828

2929
@Benchmark

bench/tests/Vector.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import scala.annotation.unchecked.uncheckedVariance
1414
import scala.compat.Platform
1515
import scala.collection.generic._
1616
import scala.collection.mutable.Builder
17+
import compiletime.uninitialized
1718

1819
/** Companion object to the Vector class
1920
*/
@@ -741,13 +742,13 @@ final class VectorBuilder[A]() extends Builder[A,Vector[A]] with VectorPointer[A
741742

742743

743744
private[immutable] trait VectorPointer[T] {
744-
private[immutable] var depth: Int = _
745-
private[immutable] var display0: Array[AnyRef] = _
746-
private[immutable] var display1: Array[AnyRef] = _
747-
private[immutable] var display2: Array[AnyRef] = _
748-
private[immutable] var display3: Array[AnyRef] = _
749-
private[immutable] var display4: Array[AnyRef] = _
750-
private[immutable] var display5: Array[AnyRef] = _
745+
private[immutable] var depth: Int = uninitialized
746+
private[immutable] var display0: Array[AnyRef] = uninitialized
747+
private[immutable] var display1: Array[AnyRef] = uninitialized
748+
private[immutable] var display2: Array[AnyRef] = uninitialized
749+
private[immutable] var display3: Array[AnyRef] = uninitialized
750+
private[immutable] var display4: Array[AnyRef] = uninitialized
751+
private[immutable] var display5: Array[AnyRef] = uninitialized
751752

752753
// used
753754
private[immutable] final def initFrom[U](that: VectorPointer[U]): Unit = initFrom(that, that.depth)

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ val `stdlib-bootstrapped-tasty-tests` = Build.`stdlib-bootstrapped-tasty-tests`
2020
val `tasty-core` = Build.`tasty-core`
2121
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
2222
val `tasty-core-scala2` = Build.`tasty-core-scala2`
23-
val scala3doc = Build.scala3doc
24-
val `scala3doc-testcases` = Build.`scala3doc-testcases`
23+
val scaladoc = Build.scaladoc
24+
val `scaladoc-testcases` = Build.`scaladoc-testcases`
25+
val `scaladoc-js` = Build.`scaladoc-js`
2526
val `scala3-bench-run` = Build.`scala3-bench-run`
2627
val dist = Build.dist
2728
val `community-build` = Build.`community-build`
Submodule PPrint updated 1 file
Submodule fansi updated 1 file
Submodule geny updated 1 file
Submodule os-lib updated 1 file
Submodule perspective added at f0525cd
Submodule zio updated 579 files

community-build/src/scala/dotty/communitybuild/Fields.scala

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)