Skip to content

Commit a2973df

Browse files
retronymadriaanm
authored andcommitted
Remove further references to forkjoin
Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
1 parent fa8012d commit a2973df

File tree

115 files changed

+6
-68894
lines changed

Some content is hidden

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

115 files changed

+6
-68894
lines changed

build-ant-macros.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191

9292
<macrodef name="simple-javac">
9393
<attribute name="project"/>
94-
<!-- project: forkjoin -->
9594
<attribute name="args" default=""/>
9695
<attribute name="jar" default="yes"/>
9796
<sequential>

doc/LICENSE.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,4 @@ This license is used by the following third-party libraries:
6161
* sizzle
6262
* tools tooltip
6363

64-
### Public Domain
65-
The following libraries are freely available in the public domain:
66-
67-
* forkjoin
6864

doc/License.rtf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,3 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \'93AS IS\'9
5757
\'95 jquery-layout\
5858
\'95 sizzle\
5959
\'95 tools tooltip\
60-
61-
\fs30 \
62-
Public Domain\
63-
64-
\fs26 The following libraries are freely available in the public domain:\
65-
\'95 forkjoin}

lib/forkjoin.jar.desired.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/build/dbuild-meta-json-gen.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val meta =
1616
ProjMeta(version = "2.12.0", projects = Seq(
1717
Project("scala-library", "org.scala-lang",
1818
Seq(ProjectRef("scala-library", "org.scala-lang")),
19-
Seq.empty), // TODO: forkjoin
19+
Seq.empty),
2020
Project("scala-reflect", "org.scala-lang",
2121
Seq(ProjectRef("scala-reflect", "org.scala-lang")),
2222
Seq(ProjectRef("scala-library", "org.scala-lang"))),

src/intellij/forkjoin.iml.SAMPLE

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

src/intellij/library.iml.SAMPLE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</content>
99
<orderEntry type="inheritedJdk" />
1010
<orderEntry type="sourceFolder" forTests="false" />
11-
<orderEntry type="module" module-name="forkjoin" />
1211
<orderEntry type="library" name="starr" level="project" />
1312
</component>
1413
</module>

src/intellij/scala.ipr.SAMPLE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<component name="ProjectModuleManager">
3737
<modules>
3838
<module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" />
39-
<module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" />
4039
<module fileurl="file://$PROJECT_DIR$/interactive.iml" filepath="$PROJECT_DIR$/interactive.iml" />
4140
<module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" />
4241
<module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" />

src/intellij/test-junit.iml.SAMPLE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="compiler" />
11-
<orderEntry type="module" module-name="forkjoin" />
1211
<orderEntry type="module" module-name="library" />
1312
<orderEntry type="module" module-name="partest-extras" />
1413
<orderEntry type="module" module-name="reflect" />

src/intellij/test.iml.SAMPLE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="compiler" />
11-
<orderEntry type="module" module-name="forkjoin" />
1211
<orderEntry type="module" module-name="interactive" />
1312
<orderEntry type="module" module-name="library" />
1413
<orderEntry type="module" module-name="partest-extras" />

test/benchmarking/AVL-insert-random.scala

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

test/benchmarking/AVL-insert.scala

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

test/benchmarking/ParCtrie-bfs.scala

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

test/benchmarking/ParCtrie-map.scala

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

test/benchmarking/ParCtrie-nums.scala

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

test/benchmarking/ParCtrie-size.scala

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

0 commit comments

Comments
 (0)