summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove -Y settings that are no longer used in 2.12Lukas Rytz2016-02-1656-216/+91
* Rewrite a few more tests to the new optimizerLukas Rytz2016-02-1515-44/+58
* Merge pull request #4966 from lrytz/inlineProjectLukas Rytz2016-02-155-15/+29
|\
| * SD-79 don't issue spurious inliner warnings under l:projectLukas Rytz2016-02-155-15/+29
|/
* Merge pull request #4963 from lrytz/simplerBranchingLukas Rytz2016-02-156-103/+242
|\
| * Avoid generating ACONST_NULL; POP; ACONST_NULL when loading nullLukas Rytz2016-02-144-12/+69
| * Generate leaner code for branchesLukas Rytz2016-02-133-91/+173
* | Merge pull request #4965 from lrytz/t8790Jason Zaugg2016-02-151-0/+20
|\ \ | |/ |/|
| * SI-8790 test caseLukas Rytz2016-02-131-0/+20
|/
* Merge pull request #4944 from lrytz/stringBuilderNoBoxLukas Rytz2016-02-125-46/+135
|\
| * SI-9571 Avoid boxing primitives in string concatenationMarko Elezovic2016-02-064-46/+120
| * test case for optimizing BooleanOrdering.compareLukas Rytz2016-02-041-0/+15
* | Merge pull request #4894 from mmynsted/2.12.xJason Zaugg2016-02-121-1/+11
|\ \
| * | Making commented example simpler for mapMark Mynsted2016-01-191-1/+11
* | | Merge pull request #4896 from retronym/topic/indy-all-the-thingsJason Zaugg2016-02-1220-188/+363
|\ \ \
| * | | Use invokedynamic for structural calls, symbol literals, lamba ser.Jason Zaugg2016-01-2920-188/+363
* | | | Merge pull request #4957 from retronym/topic/merge-2.11.x-to-2.12.x-20160210Seth Tisue2016-02-1115-19/+502
|\ \ \ \
| * \ \ \ Merge commit '39a858d' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-113-18/+17
| |\ \ \ \
| | * | | | Fix SBT tab completion of scala commandJason Zaugg2016-02-113-18/+17
| * | | | | Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-1015-19/+503
| |\| | | |
| | * | | | Merge pull request #4950 from retronym/topic/sbt-tweaks-3Seth Tisue2016-02-096-4/+421
| | |\ \ \ \
| | | * | | | Add SBT tab completion for scala{,c,doc}Jason Zaugg2016-02-094-18/+221
| | | * | | | Enable IntellIJ smarts while editing the buildJason Zaugg2016-02-072-1/+111
| | | * | | | Add tab completion to the partest commandJason Zaugg2016-02-062-1/+87
| | | * | | | Convenient aliases for the SBT buildJason Zaugg2016-02-051-3/+21
| | * | | | | Merge pull request #4937 from szeiger/issue/9623-2.11Seth Tisue2016-02-082-6/+73
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | SI-9623 Avoid unnecessary hasNext calls in JoinIterator & ConcatIteratorStefan Zeiger2016-02-012-6/+73
| | * | | | | Merge pull request #4942 from SethTisue/copyright-2016Seth Tisue2016-02-047-9/+9
| | |\ \ \ \ \
| | | * | | | | bump copyright year to 2016Seth Tisue2016-02-037-9/+9
| | |/ / / / /
* | | | | | | Merge pull request #4955 from som-snytt/issue/8685-depr-caseLukas Rytz2016-02-105-2/+119
|\ \ \ \ \ \ \
| * | | | | | | SI-9650 Refchecks on case apply transformSom Snytt2016-02-105-2/+119
* | | | | | | | Merge pull request #4924 from ShaneDelmore/SI-9452Lukas Rytz2016-02-105-35/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '2.12.x' into SI-9452Shane Delmore2016-02-0478-525/+935
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Extend BigInt with Ordered for java interopShane Delmore2016-02-013-18/+24
| * | | | | | | Extend BigDecimal with Ordered for java interopShane Delmore2016-02-012-17/+6
* | | | | | | | Merge pull request #4938 from retronym/ticket/9349Jason Zaugg2016-02-103-3/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-9349 Fix use of patmat binder as prefix for new x.InnerJason Zaugg2016-02-023-3/+25
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #4868 from retronym/ticket/9542-comboJason Zaugg2016-02-105-24/+56
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | SI-9542 Unify different reprs. of module type refsJason Zaugg2016-02-014-23/+52
| * | | | | | | SI-9542 Fix regression in value classes with enclosing refsJason Zaugg2016-02-011-1/+4
* | | | | | | | Merge pull request #4952 from felixmulder/topic/scaladoc-hideImplicitConversi...Vlad Ureche2016-02-097-70/+132
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-9620: add doc annotation to hide specific conversionsFelix Mulder2016-02-097-70/+132
|/ / / / / / / /
* | | | | | | | Merge pull request #4948 from szeiger/issue/9574Stefan Zeiger2016-02-093-6/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-9574 Prevent illegal overrides of members with module typesStefan Zeiger2016-02-083-6/+27
* | | | | | | | | Merge pull request #4949 from felixmulder/topic/scaladoc-fix-implicits-arrayVlad Ureche2016-02-061-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Scaladoc: fix duplicate implicits in ArrayFelix Mulder2016-02-061-0/+11
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4946 from felixmulder/topic/scaladoc-panzoom-graphsVlad Ureche2016-02-0610-155/+193
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add panzoom feature to Type Inheritance graphsFelix Mulder2016-02-0610-155/+193
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4947 from felixmulder/topic/scaladoc-fix-stray-numberVlad Ureche2016-02-061-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Scaladoc: fix stray number in codeblocks for firefoxFelix Mulder2016-02-051-0/+4
|/ / / / / / / /