diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-30 14:29:23 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-11-01 18:54:17 -0700 |
commit | d5ebd7e069d6a60936267e239f74ce89a3851453 (patch) | |
tree | d32e72e3867d8f7c49db6a8d052b3d2e9e3cc9ff /src/library/scala/collection/parallel/Tasks.scala | |
parent | d0c4be6861109683d80513eda74e5c6ca88f1441 (diff) | |
download | scala-d5ebd7e069d6a60936267e239f74ce89a3851453.tar.gz scala-d5ebd7e069d6a60936267e239f74ce89a3851453.tar.bz2 scala-d5ebd7e069d6a60936267e239f74ce89a3851453.zip |
Remove unused private members.
That's a lot of unused code. Most of this is pure cruft; a small
amount is debugging code which somebody might want to keep around,
but we should not be using trunk as a repository of our personal
snippets of undocumented, unused, unintegrated debugging code. So
let's make the easy decision to err in the removing direction.
If it isn't built to last, it shouldn't be checked into master.
Diffstat (limited to 'src/library/scala/collection/parallel/Tasks.scala')
-rw-r--r-- | src/library/scala/collection/parallel/Tasks.scala | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/library/scala/collection/parallel/Tasks.scala b/src/library/scala/collection/parallel/Tasks.scala index 2556cd3f68..d6b75202da 100644 --- a/src/library/scala/collection/parallel/Tasks.scala +++ b/src/library/scala/collection/parallel/Tasks.scala @@ -67,19 +67,10 @@ trait Task[R, +Tp] { private[parallel] def tryMerge(t: Tp @uncheckedVariance) { val that = t.asInstanceOf[Task[R, Tp]] val local = result // ensure that any effects of modifying `result` are detected - // checkMerge(that) if (this.throwable == null && that.throwable == null) merge(t) mergeThrowables(that) } - private def checkMerge(that: Task[R, Tp] @uncheckedVariance) { - if (this.throwable == null && that.throwable == null && (this.result == null || that.result == null)) { - println("This: " + this + ", thr=" + this.throwable + "; merged with " + that + ", thr=" + that.throwable) - } else if (this.throwable != null || that.throwable != null) { - println("merging this: " + this + " with thr: " + this.throwable + " with " + that + ", thr=" + that.throwable) - } - } - private[parallel] def mergeThrowables(that: Task[_, _]) { if (this.throwable != null && that.throwable != null) { // merge exceptions, since there were multiple exceptions |