Rename forall, exists and find predicate and operator params. by janekdb · Pull Request #4789 · scala/scala

janekdb · 2015-10-06T20:33:52Z

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.

The scope for this commit is code changes with some closely related documentation moved over.

janekdb · 2015-10-06T20:39:42Z

Review by @sschaef, @lrytz, @SethTisue, @som-snytt, @soc.

kiritsuku · 2015-10-06T20:46:05Z

src/library/scala/collection/GenTraversableOnce.scala

s/for some/at least for one/

"for at least one" is more idiomatic

"for one, at least" is more plaintive.

I think Scala needs a wiki page of existential puns and expressions.

Fixed here and in TraversableLike

janekdb · 2015-10-07T19:35:45Z

src/library/scala/collection/immutable/RedBlackTree.scala

This object this method belongs to has private[this] access so I'm assuming deprecatedName is not required.

janekdb · 2015-10-07T19:39:02Z

Finished responding to comments.

Review by @sschaef, @SethTisue, @som-snytt, @mpociecha .

Align parameters names to use p for predicates and op for combining operations. Based on scala#4760. Extended to include, - Tuple2Zipped - Tuple3Zipped - Either The original author was vsalvis.

SethTisue · 2015-10-09T22:16:10Z

LGTM

janekdb · 2015-10-13T16:00:22Z

Once this is merged I can rebase #4760 and continue with the other changes.

…perations Rename forall, exists and find predicate and operator params.

rather than attempt to resolve merge conflicts in the Eclipse config, the log shows that I merged ae5f0de with `-s ours`. (I have invited Mike/performantdata to submit a followup PR bringing the Eclipse stuff into a good state on 2.12.x.) there were no other merge conflicts. in test/junit/scala/collection/mutable/OpenHashMapTest.scala I had to make the following change to fix a test failure: - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") % git log --decorate --oneline -1 origin/2.11.x | cat ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request scala#4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa2 % git checkout -b merge-2.11-to-2.12-oct-16 Switched to a new branch 'merge-2.11-to-2.12-oct-16' % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request scala#4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request scala#4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request scala#4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request scala#4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request scala#4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request scala#4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request scala#4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge fe76232 Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging README.md Merge made by the 'recursive' strategy. README.md | 11 +++++++- spec/07-implicits.md | 12 +++++++-- src/eclipse/interactive/.gitignore | 2 ++ src/eclipse/partest/.gitignore | 2 ++ src/eclipse/reflect/.gitignore | 2 ++ src/eclipse/repl/.gitignore | 2 ++ src/eclipse/scala-compiler/.gitignore | 2 ++ src/eclipse/scala-library/.gitignore | 2 ++ src/eclipse/scaladoc/.gitignore | 2 ++ src/eclipse/scalap/.gitignore | 2 ++ src/eclipse/test-junit/.gitignore | 2 ++ src/library/scala/collection/GenTraversableOnce.scala | 23 ++++++++++++++--- src/library/scala/collection/TraversableLike.scala | 2 +- src/library/scala/collection/immutable/ListMap.scala | 2 +- src/library/scala/collection/immutable/RedBlackTree.scala | 4 +-- src/library/scala/collection/immutable/Set.scala | 74 ++++++++++++++++++++++++++--------------------------- src/library/scala/collection/mutable/OpenHashMap.scala | 19 +++++++++++++- src/library/scala/collection/parallel/ParIterableLike.scala | 18 ++++++------- src/library/scala/runtime/Tuple2Zipped.scala | 8 +++--- src/library/scala/runtime/Tuple3Zipped.scala | 8 +++--- src/library/scala/util/Either.scala | 12 ++++----- src/repl/scala/tools/nsc/interpreter/ILoop.scala | 51 ++++++++++++++++++++++++------------ src/repl/scala/tools/nsc/interpreter/ReplProps.scala | 2 ++ test/files/run/repl-paste-5.check | 28 ++++++++++++++++++++ test/files/run/repl-paste-5.scala | 18 +++++++++++++ test/junit/scala/collection/mutable/OpenHashMapTest.scala | 42 ++++++++++++++++++++++++++++++ 26 files changed, 264 insertions(+), 88 deletions(-) create mode 100644 src/eclipse/interactive/.gitignore create mode 100644 src/eclipse/partest/.gitignore create mode 100644 src/eclipse/reflect/.gitignore create mode 100644 src/eclipse/repl/.gitignore create mode 100644 src/eclipse/scala-compiler/.gitignore create mode 100644 src/eclipse/scala-library/.gitignore create mode 100644 src/eclipse/scaladoc/.gitignore create mode 100644 src/eclipse/scalap/.gitignore create mode 100644 src/eclipse/test-junit/.gitignore create mode 100644 test/files/run/repl-paste-5.check create mode 100644 test/files/run/repl-paste-5.scala create mode 100644 test/junit/scala/collection/mutable/OpenHashMapTest.scala % git merge -s ours ae5f0de Merge made by the 'ours' strategy.

ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request scala#4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa2 % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request scala#4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request scala#4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request scala#4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request scala#4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request scala#4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request scala#4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request scala#4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge ae5f0de Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging src/eclipse/test-junit/.classpath CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath Auto-merging src/eclipse/scaladoc/.classpath CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath Auto-merging src/eclipse/scala-compiler/.classpath Auto-merging src/eclipse/repl/.classpath CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath Auto-merging src/eclipse/partest/.classpath CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath Auto-merging src/eclipse/interactive/.classpath Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. % git checkout --ours src/eclipse/partest/.classpath % git checkout --ours src/eclipse/repl/.classpath % git checkout --ours src/eclipse/scaladoc/.classpath % git checkout --ours src/eclipse/test-junit/.classpath % git add -u % emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala % git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat ... - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") ... % git add -u

@performantdata

there were merge conflicts in the Eclipse config that I resolved with --ours. I invite @performantdata to submit a followup PR bringing the Eclipse stuff into a good state on 2.12.x. there was a test failure in test/junit/scala/collection/mutable/OpenHashMapTest.scala due to the 2.12 compiler emitting the field backing a private var differently (with an unmangled name). Lukas says the difference is expected, so I just updated the code in the test. there were no other merge conflicts. % git log --decorate --oneline -1 origin/2.11.x | cat ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request scala#4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa2 % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request scala#4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request scala#4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request scala#4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request scala#4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request scala#4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request scala#4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request scala#4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request scala#4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge ae5f0de Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging src/eclipse/test-junit/.classpath CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath Auto-merging src/eclipse/scaladoc/.classpath CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath Auto-merging src/eclipse/scala-compiler/.classpath Auto-merging src/eclipse/repl/.classpath CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath Auto-merging src/eclipse/partest/.classpath CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath Auto-merging src/eclipse/interactive/.classpath Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. % git checkout --ours src/eclipse/partest/.classpath % git checkout --ours src/eclipse/repl/.classpath % git checkout --ours src/eclipse/scaladoc/.classpath % git checkout --ours src/eclipse/test-junit/.classpath % git add -u % emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala % git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat ... - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") ... % git add -u

scala-jenkins added this to the 2.11.8 milestone Oct 6, 2015

janekdb force-pushed the 2.11.x-param-names-predicates-operations branch from 51a7bb5 to 5779c00 Compare October 6, 2015 20:35

janekdb mentioned this pull request Oct 6, 2015

2.11.x collection documentation fixes #4760

Merged

33 tasks

kiritsuku reviewed Oct 6, 2015
View reviewed changes

janekdb force-pushed the 2.11.x-param-names-predicates-operations branch from 5779c00 to 83a2206 Compare October 7, 2015 19:33

janekdb reviewed Oct 7, 2015
View reviewed changes

Rename forall, exists and find predicate and operator params.

b19a07e

Align parameters names to use p for predicates and op for combining operations. Based on scala#4760. Extended to include, - Tuple2Zipped - Tuple3Zipped - Either The original author was vsalvis.

janekdb force-pushed the 2.11.x-param-names-predicates-operations branch from 83a2206 to b19a07e Compare October 9, 2015 19:08

scala-jenkins added the reviewed label Oct 9, 2015

SethTisue added a commit that referenced this pull request Oct 13, 2015

Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-o…

d792e35

…perations Rename forall, exists and find predicate and operator params.

SethTisue merged commit d792e35 into scala:2.11.x Oct 13, 2015

SethTisue mentioned this pull request Oct 16, 2015

merge 2.11 to 2.12 Oct 16 #4802

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename forall, exists and find predicate and operator params.#4789

Rename forall, exists and find predicate and operator params.#4789
SethTisue merged 1 commit intoscala:2.11.xfrom
janekdb:2.11.x-param-names-predicates-operations

janekdb commented Oct 6, 2015

Uh oh!

janekdb commented Oct 6, 2015

Uh oh!

kiritsuku Oct 6, 2015

Uh oh!

SethTisue Oct 6, 2015

Uh oh!

som-snytt Oct 6, 2015

Uh oh!

janekdb Oct 7, 2015

Uh oh!

janekdb Oct 7, 2015

Uh oh!

janekdb commented Oct 7, 2015

Uh oh!

SethTisue commented Oct 9, 2015

Uh oh!

janekdb commented Oct 13, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

janekdb commented Oct 6, 2015

Uh oh!

janekdb commented Oct 6, 2015

Uh oh!

kiritsuku Oct 6, 2015

Choose a reason for hiding this comment

Uh oh!

SethTisue Oct 6, 2015

Choose a reason for hiding this comment

Uh oh!

som-snytt Oct 6, 2015

Choose a reason for hiding this comment

Uh oh!

janekdb Oct 7, 2015

Choose a reason for hiding this comment

Uh oh!

janekdb Oct 7, 2015

Choose a reason for hiding this comment

Uh oh!

janekdb commented Oct 7, 2015

Uh oh!

SethTisue commented Oct 9, 2015

Uh oh!

janekdb commented Oct 13, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants