diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-16 13:06:38 +1000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-15 22:32:43 -0700 |
commit | a2973dfd954c0c094f956becb05a82bee5f7da01 (patch) | |
tree | 2135ee1616ff3920d00c35046be2037af9aa3a3f /src/intellij | |
parent | fa8012d28687986902ce1255a19f9f49affb3bca (diff) | |
download | scala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.gz scala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.bz2 scala-a2973dfd954c0c094f956becb05a82bee5f7da01.zip |
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.
Diffstat (limited to 'src/intellij')
-rw-r--r-- | src/intellij/forkjoin.iml.SAMPLE | 11 | ||||
-rw-r--r-- | src/intellij/library.iml.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/scala.ipr.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/test-junit.iml.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/test.iml.SAMPLE | 1 |
5 files changed, 0 insertions, 15 deletions
diff --git a/src/intellij/forkjoin.iml.SAMPLE b/src/intellij/forkjoin.iml.SAMPLE deleted file mode 100644 index 42507b2911..0000000000 --- a/src/intellij/forkjoin.iml.SAMPLE +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$/../forkjoin"> - <sourceFolder url="file://$MODULE_DIR$/../forkjoin" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module>
\ No newline at end of file diff --git a/src/intellij/library.iml.SAMPLE b/src/intellij/library.iml.SAMPLE index b03fef9414..8ceb9dd3f1 100644 --- a/src/intellij/library.iml.SAMPLE +++ b/src/intellij/library.iml.SAMPLE @@ -8,7 +8,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="library" name="starr" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE index 290d53aa5d..3e6e074717 100644 --- a/src/intellij/scala.ipr.SAMPLE +++ b/src/intellij/scala.ipr.SAMPLE @@ -36,7 +36,6 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" /> - <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" /> <module fileurl="file://$PROJECT_DIR$/interactive.iml" filepath="$PROJECT_DIR$/interactive.iml" /> <module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" /> <module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" /> diff --git a/src/intellij/test-junit.iml.SAMPLE b/src/intellij/test-junit.iml.SAMPLE index 8252ef6d98..326c9813aa 100644 --- a/src/intellij/test-junit.iml.SAMPLE +++ b/src/intellij/test-junit.iml.SAMPLE @@ -8,7 +8,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="compiler" /> - <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="partest-extras" /> <orderEntry type="module" module-name="reflect" /> diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index e7eb7576c3..d1f2975fbf 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -8,7 +8,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="compiler" /> - <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="module" module-name="interactive" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="partest-extras" /> |