Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SI-8969 Accept poly+implicit for assignment syntax #5769

Merged
merged 1 commit into from Mar 10, 2017
Merged

SI-8969 Accept poly+implicit for assignment syntax #5769

merged 1 commit into from Mar 10, 2017

Conversation

som-snytt
Copy link
Contributor

Follow-up to fb061f2
which allowed the type param only.

Reported:

scala> object Test {
     |   def a[R](implicit s: List[R]):Int = 0
     |   def a_=[R](v: Int)(implicit s: List[R]) = ()
     | }

@som-snytt
SI-8969 Accept poly+implicit for assignment syntax
050811b 
Follow-up to fb061f2
which allowed the type param only.

Reported:
```
scala> object Test {
     |   def a[R](implicit s: List[R]):Int = 0
     |   def a_=[R](v: Int)(implicit s: List[R]) = ()
     | }
```
@scala-jenkins scala-jenkins added this to the 2.12.2 milestone Mar 9, 2017
@adriaanm adriaanm self-requested a review March 9, 2017 19:15
adriaanm
adriaanm approved these changes Mar 9, 2017
View reviewed changes
Copy link
Contributor

@adriaanm adriaanm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robust software, one case at a time!

@som-snytt
Copy link
Contributor Author

@adriaanm I always suspected you ran the world. In your unassuming way.

@lrytz lrytz merged commit 482879f into scala:2.12.x Mar 10, 2017
@som-snytt som-snytt deleted the issue/8969 branch March 10, 2017 17:53
SethTisue added a commit to SethTisue/scala that referenced this pull request Mar 21, 2017
@SethTisue
Merge branch '2.12.x' into 2.13.x
17633b2 
no interesting merge conflicts.  versions.properties is always a
conflict factory, and HashMap.scala was because of parallel
collections removal.

% export mb=$(git merge-base origin/2.12.x origin/2.13.x)
% git log --graph --oneline --decorate $mb..origin/2.12.x | cat
*   96cdfb4 (origin/HEAD, origin/2.12.x) Merge pull request scala#5741 from monkey-mas/bump-up-sbt-jmh-to-0.2.21
|\
| * 08f753e Bump up sbt-jmh to 0.2.21
*   38baf2b Merge pull request scala#5771 from som-snytt/issue/regex-doc-err
|\
| * cc1b8f3 Fix and improve Regex doc
* |   6f905fd Merge pull request scala#5747 from dwijnand/fix-root-package-task
|\ \
| * | 4c1c8de Rewire package to osgiBundle for OSGi-enabled projects
|  /
* |   57948c8 Merge pull request scala#5791 from SethTisue/cruft-begone
|\ \
| * | 4b98161 remove test/pending directory too
| * | 25048bc (SethTisue/cruft-begone) rm -r test/{flaky,disabled*,checker-tests,support,debug}
| * | 0563c4b remove orphaned checkfiles
| * | 36357f3 remove two empty source files
| * | 8690809 fix typos
| * | 8177b99 unset a stray execute bit
* | |   c7c2152 Merge pull request scala#5776 from lrytz/numbersCleanup
|\ \ \
| * | | 77e0602 cleanups and clarifications in versions.properties
|  / /
* | |   95a263e Merge pull request scala#5789 from ceeph/patch-1
|\ \ \
| |/ /
|/| |
| * | a9ba3e6 Fix table formatting
|/ /
* |   6048c66 Merge pull request scala#5780 from lrytz/bootstrapOverwrite
|\ \
| * | 6ff3891 Use a single repository in the bootstrap job
|/ /
* |   0dab108 Merge pull request scala#5777 from som-snytt/issue/10226
|\ \
| * | c77b420 SI-10226 REPL handles paste when colorized
|/ /
* |   d0c2620 Merge pull request scala#5756 from rorygraves/2.12.x_depthboxing
|\ \
| * | f7cd76b Reduce boxing of scala.reflect.internal.Depth
|  /
* |   17e057b Merge pull request scala#5755 from rorygraves/2.12.x_map4
|\ \
| * | 0c6d4e5 Performance improvements for Map4 to HashMap nad Set4 to HashSet transitions
| * | aefc8f4 Add benchmarks for Map4 to HashMap and Set4 to HashSet transitions
| * | fad8b95 Fix compile error on existing ListBenchmark
|  /
* |   3fadf69 Merge pull request scala#5675 from piyush-jaiswal/issue/9729
|\ \
| |/
|/|
| * cc99026 Add tests for ConsoleReporter.
*   6e9268b Merge pull request scala#5761 from lrytz/sd329
|\
| * 6abb6ba Don't use `equals` for comparing java.lang.Double/Float
*   680d866 Merge pull request scala#5719 from retronym/ticket/10187
|\
| * 898fa00 SI-10187 Support mutation of mutable.HashMap in getOrElseUpdate
*   0e38f28 Merge pull request scala#5767 from som-snytt/issue/5621
|\
| * dea2171 SI-5621 Missing implicits are supplied by defaults
*   482879f Merge pull request scala#5769 from som-snytt/issue/8969
|\
| * 050811b SI-8969 Accept poly+implicit for assignment syntax
* cba77ce Merge pull request scala#5766 from lrytz/versionsReadme
* 8fcb9f1 Adapt README to new version numbers
% git merge origin/2.12.x
% git status
...
	both modified:   src/library/scala/collection/mutable/HashMap.scala
	deleted by them: test/pending/shootout/fasta.scala
	both modified:   versions.properties
% git rm --force test/pending/shootout/fasta.scala
% emacs versions.properties
% git add -u versions.properties
% emacs src/library/scala/collection/mutable/HashMap.scala
% git add -u src/library/scala/collection/mutable/HashMap.scala
@scabug scabug mentioned this pull request Apr 7, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adriaanm adriaanm adriaanm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.12.2
4 participants
@som-snytt @adriaanm @lrytz @scala-jenkins