diff options
author | Janek Bogucki <janekdb@gmail.com> | 2015-10-07 20:32:49 +0100 |
---|---|---|
committer | Janek Bogucki <janekdb@gmail.com> | 2015-10-09 20:07:19 +0100 |
commit | b19a07ed15f8a633e0463e52839c956963a9c2f9 (patch) | |
tree | 43840caeaebc12e2c40d8620b1de579ad7529a83 /src/library/scala/runtime/Tuple2Zipped.scala | |
parent | 648c7a1635f88fb14b999a8d36e01a71761b9001 (diff) | |
download | scala-b19a07ed15f8a633e0463e52839c956963a9c2f9.tar.gz scala-b19a07ed15f8a633e0463e52839c956963a9c2f9.tar.bz2 scala-b19a07ed15f8a633e0463e52839c956963a9c2f9.zip |
Rename forall, exists and find predicate and operator params.
Align parameters names to use p for predicates and op for combining operations.
Based on #4760. Extended to include,
- Tuple2Zipped
- Tuple3Zipped
- Either
The original author was vsalvis.
Diffstat (limited to 'src/library/scala/runtime/Tuple2Zipped.scala')
-rw-r--r-- | src/library/scala/runtime/Tuple2Zipped.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/runtime/Tuple2Zipped.scala b/src/library/scala/runtime/Tuple2Zipped.scala index 512c4fbc27..4109f5cb4b 100644 --- a/src/library/scala/runtime/Tuple2Zipped.scala +++ b/src/library/scala/runtime/Tuple2Zipped.scala @@ -84,12 +84,12 @@ final class Tuple2Zipped[El1, Repr1, El2, Repr2](val colls: (TraversableLike[El1 (b1.result(), b2.result()) } - def exists(f: (El1, El2) => Boolean): Boolean = { + def exists(@deprecatedName('f) p: (El1, El2) => Boolean): Boolean = { val elems2 = colls._2.iterator for (el1 <- colls._1) { if (elems2.hasNext) { - if (f(el1, elems2.next())) + if (p(el1, elems2.next())) return true } else return false @@ -97,8 +97,8 @@ final class Tuple2Zipped[El1, Repr1, El2, Repr2](val colls: (TraversableLike[El1 false } - def forall(f: (El1, El2) => Boolean): Boolean = - !exists((x, y) => !f(x, y)) + def forall(@deprecatedName('f) p: (El1, El2) => Boolean): Boolean = + !exists((x, y) => !p(x, y)) def foreach[U](f: (El1, El2) => U): Unit = { val elems2 = colls._2.iterator |