{"action":"created","issue":{"url":"https://api.github.com/repos/scala/scala/issues/4864","labels_url":"https://api.github.com/repos/scala/scala/issues/4864/labels{/name}","comments_url":"https://api.github.com/repos/scala/scala/issues/4864/comments","events_url":"https://api.github.com/repos/scala/scala/issues/4864/events","html_url":"https://github.com/scala/scala/pull/4864","id":118564352,"number":4864,"title":"Merge 2.11 to 2.12 nov 24","user":{"login":"lrytz","id":119636,"avatar_url":"https://avatars.githubusercontent.com/u/119636?v=3","gravatar_id":"","url":"https://api.github.com/users/lrytz","html_url":"https://github.com/lrytz","followers_url":"https://api.github.com/users/lrytz/followers","following_url":"https://api.github.com/users/lrytz/following{/other_user}","gists_url":"https://api.github.com/users/lrytz/gists{/gist_id}","starred_url":"https://api.github.com/users/lrytz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lrytz/subscriptions","organizations_url":"https://api.github.com/users/lrytz/orgs","repos_url":"https://api.github.com/users/lrytz/repos","events_url":"https://api.github.com/users/lrytz/events{/privacy}","received_events_url":"https://api.github.com/users/lrytz/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":{"url":"https://api.github.com/repos/scala/scala/milestones/51","html_url":"https://github.com/scala/scala/milestones/2.12.0-M4","labels_url":"https://api.github.com/repos/scala/scala/milestones/51/labels","id":1337791,"number":51,"title":"2.12.0-M4","description":"Merge to 2.12.x\r\n\r\nPart 1:\r\n\r\n  - [ ] additional closure-specific heuristics for inliner (lukas)\r\n  - [ ] use default methods to FunctionN to interfaces (jason)\r\n  - [ ] use default methods to compile traits to interfaces (generalization of FunctionN task)\r\n  - [ ] compiler performance analysis after M2 (jason, lukas)\r\n  - [ ] enable SAM by default (adriaan)\r\n\r\nPart 2:\r\n\r\n  - [ ] improve wildcard inference, spec (adriaan)\r\n  - [ ] sbt build (seth)\r\n  - [ ] detuplify patmat optimization\r\n  - [ ] enable `-YclasspathImpl:flat` by default (seth)\r\n  - [ ] ensure we can safely remove genicode (sbt/ide/...) (lukas / seth)\r\n\r\nPart 3:\r\n\r\n  - [ ] intermediate implementation of SIP 23 (adriaan)\r\n  - [ ] structural type invocations using INDY? (jason)\r\n  - [ ] collections integration with Java 8 Streams (rex / adriaan)\r\n  - [ ] type lambda support (jason)\r\n  - [ ] desugar function literals for non-`FunctionN` SAM types to `Function` trees and indylambda (instead of creating an anonymous class during typer)\r\n","creator":{"login":"lrytz","id":119636,"avatar_url":"https://avatars.githubusercontent.com/u/119636?v=3","gravatar_id":"","url":"https://api.github.com/users/lrytz","html_url":"https://github.com/lrytz","followers_url":"https://api.github.com/users/lrytz/followers","following_url":"https://api.github.com/users/lrytz/following{/other_user}","gists_url":"https://api.github.com/users/lrytz/gists{/gist_id}","starred_url":"https://api.github.com/users/lrytz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lrytz/subscriptions","organizations_url":"https://api.github.com/users/lrytz/orgs","repos_url":"https://api.github.com/users/lrytz/repos","events_url":"https://api.github.com/users/lrytz/events{/privacy}","received_events_url":"https://api.github.com/users/lrytz/received_events","type":"User","site_admin":false},"open_issues":16,"closed_issues":35,"state":"open","created_at":"2015-10-05T09:46:45Z","updated_at":"2015-11-24T09:19:17Z","due_on":"2015-12-21T08:00:00Z","closed_at":null},"comments":1,"created_at":"2015-11-24T09:19:15Z","updated_at":"2015-11-24T09:19:54Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/scala/scala/pulls/4864","html_url":"https://github.com/scala/scala/pull/4864","diff_url":"https://github.com/scala/scala/pull/4864.diff","patch_url":"https://github.com/scala/scala/pull/4864.patch"},"body":"```\r\n➜  scala git:(2.12.x) PROMPT=\"$ \"\r\n\r\n$ git log --decorate --oneline -1 2.11.x | cat\r\n8eb1d4c (upstream/2.11.x, origin/2.11.x, 2.11.x) Merge pull request #4859 from fthomas/topic/spec-value-conversions\r\n\r\n$ git log --decorate --oneline -1 2.12.x | cat\r\n3d0cbf9 (HEAD -> 2.12.x, upstream/2.12.x, origin/2.12.x) Merge pull request #4854 from triggerNZ/serializable-partial-functions\r\n\r\n$ export MB=$(git merge-base 2.12.x 2.11.x)\r\n\r\n$ git checkout 2.12.x\r\n$ git checkout -b merge-2.11-to-2.12-nov-24\r\n\r\n$ git log --graph --oneline --decorate $MB...2.11.x | cat\r\n*   8eb1d4c (upstream/2.11.x, origin/2.11.x, 2.11.x) Merge pull request #4859 from fthomas/topic/spec-value-conversions\r\n|\\\r\n| * 57ad0b4 Update number of subsections in Value Conversions\r\n* |   d49484d Merge pull request #4860 from janekdb/2.11.x-scaladoc-fix-one-off-dot-restart-note\r\n|\\ \\\r\n| |/\r\n|/|\r\n| * 35dd1a9 Align DotRunner dot restart count with command option description\r\n* |   9ed51f2 Merge pull request #4849 from janekdb/2.11.x-remove-lagged-scaladoc-setttings-notes\r\n|\\ \\\r\n| * | d9068b3 Remove notes about -doc-title and -doc-version not being used\r\n| |/\r\n* |   209d8d4 Merge pull request #4850 from janekdb/2.11.x-add-missing-scaladoc-commands-to-help-output\r\n|\\ \\\r\n| * | 6fceb39 Add two missed scaladoc commands into scaladoc specific help section\r\n| |/\r\n* |   53e4435 Merge pull request #4853 from SethTisue/mima-upgrade\r\n|\\ \\\r\n| * | 9e174c2 upgrade to MiMa 0.1.8\r\n* | |   e5a748c Merge pull request #4856 from janekdb/2.11.x-scaladoc-excluded-classnames-more-data-like\r\n|\\ \\ \\\r\n| * | | f0f7dcd Refactor excluded qname test to be more data like\r\n| | |/\r\n| |/|\r\n* | |   d549eef Merge pull request #4857 from janekdb/2.11.x-scaladoc-fix-List-performance-time-space-formatting\r\n|\\ \\ \\\r\n| |/ /\r\n|/| |\r\n| * | a792462 Fix List Scaladoc time & space formatting\r\n|/ /\r\n* |   72b855f (upstream-writable/2.11.x, scala/2.11.x) Merge pull request #4828 from retronym/topic/existential-contains\r\n|\\ \\\r\n| * | 238b1fb (retronym/topic/existential-contains) Attacking exponential complexity in TypeMaps\r\n* | |   c7040b6 Merge pull request #4839 from SethTisue/reword-dependent-type-error\r\n|\\ \\ \\\r\n| * | | 167f79c less confusing wording for a dependent method type error\r\n| |/ /\r\n* | |   7a75c0f Merge pull request #4824 from szeiger/wip/sbt-mkBin\r\n|\\ \\ \\\r\n| * | | 7248894 Improve version handling and scaladoc generation in sbt build\r\n| * | | 3cddb7f Build scaladoc sets from sbt\r\n| * | | f79ef27 Create usable “quick” and “pack” builds from sbt\r\n| * | | 9debc84 Create shaded JLine in sbt build\r\n| * | | 5e080eb Fix the dist/mkBin target in the sbt build\r\n| |/ /\r\n* | |   0c597f0 Merge pull request #4809 from wpopielarski/delambdafy-multiple-outputs\r\n|\\ \\ \\\r\n| * | | b237fb3 Test added\r\n| * | | 9688625 Sets source for newly created lambda class\r\n| * | | 65b60c8 Allows to propagate fatal errors when output folder not found.\r\n| * | | 153c70b Multi output problem with delambdafied compilation\r\n| |/ /\r\n* | |   9cdfc45 Merge pull request #4843 from SethTisue/scaladoc-little-d-please\r\n|\\ \\ \\\r\n| |_|/\r\n|/| |\r\n| * | 4c3e766 it's Scaladoc, not \"ScalaDoc\" or \"Scala doc\"\r\n* | |   6e6b855 Merge pull request #4810 from ruippeixotog/fix-mutable-setlike-clear\r\n|\\ \\ \\\r\n| * | | e7079ca SI-9497 Fix SetLike#clear() default implementation\r\n* | | |   3dc2690 Merge pull request #4804 from jvican/issue/9503\r\n|\\ \\ \\ \\\r\n| * | | | d6e7591 [SI-9503] Deprecate scala.collection.immutable.PagedSeq\r\n* | | | |   2218497 Merge pull request #4760 from janekdb/2.11.x-collection-documentation-fixes-previously-4651\r\n|\\ \\ \\ \\ \\\r\n| |_|_|/ /\r\n|/| | | |\r\n| * | | | e3cbcd5 Improve collections documentation and prefer () to {}\r\n| | |_|/\r\n| |/| |\r\n* | | |   e10413e Merge pull request #4833 from xuwei-k/patch-2\r\n|\\ \\ \\ \\\r\n| |/ / /\r\n|/| | |\r\n| * | | 69db630 \"macro\" is a reserved word since Scala 2.11\r\n|/ / /\r\n* | |   a24ca7f Merge pull request #4803 from janekdb/2.11.x-conform-foreach-tparam\r\n|\\ \\ \\\r\n| * | | 6ed7010 Conform foreach tparam to majority naming convention\r\n| |/ /\r\n* | |   e6c8861 Merge pull request #4818 from som-snytt/issue/4950-tweak\r\n|\\ \\ \\\r\n| |_|/\r\n|/| |\r\n| * | 212da3d (som-snytt/issue/4950-tweak) SI-4950 Test reduction\r\n|/ /\r\n* |   ba17316 Merge pull request #4795 from SethTisue/windows-ci\r\n|\\ \\\r\n| * | b3bffef Windows CI: don't hardcode Ant path quite so hard\r\n| * | 543e739 add note to readme about Windows build\r\n| * | 52cf99a add comment about Cygwin trouble to test/partest\r\n| * | 021d5e3 add experimental Windows script for testing\r\n| * | 213ecd5 Windows: make get-scala-commit-sha/date scripts work on Cygwin\r\n| * | 129c9d2 fix t7634 to work on Cygwin\r\n|  /\r\n* |   6e2d7ed Merge pull request #4800 from sjrd/remove-lingering-println\r\n|\\ \\\r\n| |/\r\n|/|\r\n| * e01bff8 Remove two lingering `println`s in non-debug methods of the library.\r\n* cea7de0 (scala3/2.11.x) Merge pull request #4792 from SethTisue/round-of-readme-updates\r\n* 37f5713 more readme improvements\r\n* 5d2c929 misc upgrades to README\r\n\r\n\r\n$ git merge 8eb1d4c\r\n\r\nCONFLICT (content): Merge conflict in src/library/scala/collection/mutable/AnyRefMap.scala\r\n  - conflict in removed whitespace in https://github.com/scala/scala/pull/4803/files#diff-893c7f56da71d18b8e13f9315de842a0L337, there are some new methods in 2.12 (https://github.com/scala/scala/blob/2.12.x/src/library/scala/collection/mutable/AnyRefMap.scala#L340-L356)\r\n\r\nCONFLICT (content): Merge conflict in src/library/scala/collection/mutable/LongMap.scala\r\n  - same as AnyRefMap\r\n\r\nCONFLICT (content): Merge conflict in src/library/scala/collection/immutable/Stream.scala\r\n  - StreamWithFilter.foreach type parameter renamed https://github.com/scala/scala/pull/4803/files#diff-2cb79b3f80ccf01f4a1377d8cd140bb7L569, the class moved in 2.12 to the companion object.\r\n\r\nCONFLICT (content): Merge conflict in src/eclipse/README.md\r\n  - 2.12 readme was not in synch, so the changes conflicted. now the two are the same, modulo an additional paragraph in the 2.12 version (point 5. in https://github.com/scala/scala/blob/865bc1c3028423cb268bfaad3a2aeb7a07dbbb21/src/eclipse/README.md)\r\n\r\nCONFLICT (content): Merge conflict in build.sbt\r\n  - two additions on the same line (https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceR175 and https://github.com/scala/scala/blob/2.12.x/build.sbt#L145)\r\n  - forkjoin changes in https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceL157 (no forkjoin in 2.12)\r\n  - actors changes in https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceL215 (no actors in 2.12)\r\n  - change in https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceL262 (no actors in 2.12)\r\n  - change in https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceL292 (no forkjoin in 2.12)\r\n  - removed `actors` from https://github.com/scala/scala/pull/4824/files#diff-fdc3abdfd754eeb24090dbd90aeec2ceR409\r\n  - removed everything `continuations` related in from https://github.com/scala/scala/pull/4824/files\r\n\r\nCONFLICT (content): Merge conflict in README.md\r\n  - section about JDK / Ant version requirements was conflicting\r\n```"},"comment":{"url":"https://api.github.com/repos/scala/scala/issues/comments/159204728","html_url":"https://github.com/scala/scala/pull/4864#issuecomment-159204728","issue_url":"https://api.github.com/repos/scala/scala/issues/4864","id":159204728,"user":{"login":"lrytz","id":119636,"avatar_url":"https://avatars.githubusercontent.com/u/119636?v=3","gravatar_id":"","url":"https://api.github.com/users/lrytz","html_url":"https://github.com/lrytz","followers_url":"https://api.github.com/users/lrytz/followers","following_url":"https://api.github.com/users/lrytz/following{/other_user}","gists_url":"https://api.github.com/users/lrytz/gists{/gist_id}","starred_url":"https://api.github.com/users/lrytz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lrytz/subscriptions","organizations_url":"https://api.github.com/users/lrytz/orgs","repos_url":"https://api.github.com/users/lrytz/repos","events_url":"https://api.github.com/users/lrytz/events{/privacy}","received_events_url":"https://api.github.com/users/lrytz/received_events","type":"User","site_admin":false},"created_at":"2015-11-24T09:19:54Z","updated_at":"2015-11-24T09:19:54Z","body":"review by @SethTisue "}}