Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit] | Lukas Rytz | 2016-04-20 | 2 | -2/+15 | |
* | | | | | | | | More efficient code for deciding if a mixin forwarder is needed (#5116) | Lukas Rytz | 2016-04-25 | 8 | -16/+42 | |
* | | | | | | | | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-25 | 16 | -35/+193 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge commit '2dd311f' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | CI: hardcode java path in integrate/windows script | Adriaan Moors | 2016-04-21 | 1 | -5/+6 | |
| | * | | | | | | | Merge pull request #5113 from adriaanm/ci-win-java6 | Adriaan Moors | 2016-04-21 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | CI: use java 6 for windows integration | Adriaan Moors | 2016-04-21 | 1 | -0/+3 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge commit '684c314' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 7 | -6/+90 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | SI-9734 Narrow type when import REPL history (#5084) | som-snytt | 2016-04-20 | 3 | -1/+41 | |
| | * | | | | | | | SI-9735 REPL prefer standard escapes for code text (#5086) | som-snytt | 2016-04-20 | 3 | -4/+48 | |
| | * | | | | | | | Updating README.md Eclipse version reference. (#5092) | CodingTwinky | 2016-04-20 | 1 | -1/+1 | |
| * | | | | | | | | Merge commit '23159d2' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 9 | -29/+103 | |
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Automate Eclipse settings and update project files: (#5091) | Iulian Dragos | 2016-04-20 | 9 | -27/+101 | |
| | | |_|_|/ / | | |/| | | | | ||||||
* | | | | | | | Merge pull request #5109 from lrytz/pr5064 | Lukas Rytz | 2016-04-23 | 73 | -503/+873 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rename the (deprecated) implicit conversion methods in JavaConversions | Lukas Rytz | 2016-04-22 | 4 | -2/+59 | |
| * | | | | | | | Cleaned up Scaladoc for JavaConverters and non-deprecated friends | Lukas Rytz | 2016-04-22 | 7 | -872/+261 | |
| * | | | | | | | SI-9684 Deprecate JavaConversions | Som Snytt | 2016-04-22 | 71 | -152/+1076 | |
| |/ / / / / / | ||||||
* / / / / / / | SI-9516 Fix the behavior of Int shift Long operations. (#5117) | Sébastien Doeraene | 2016-04-23 | 3 | -7/+60 | |
|/ / / / / / | ||||||
* | | | | | | CI: hardcode java path in integrate/windows script | Adriaan Moors | 2016-04-21 | 1 | -7/+7 | |
* | | | | | | Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodes | Lukas Rytz | 2016-04-22 | 11 | -108/+74 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove the duplicate implem of hash codes for numbers. | Sébastien Doeraene | 2016-04-21 | 12 | -103/+61 | |
| * | | | | | | Bring Statics.doubleHash in sync with BoxesRunTime.hashFromDouble. | Sébastien Doeraene | 2016-04-21 | 2 | -13/+21 | |
* | | | | | | | CI: fix integrate-windows script | Adriaan Moors | 2016-04-21 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #5114 from adriaanm/ci-win-java8 | Adriaan Moors | 2016-04-21 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | CI: use java 8 for windows integration | Adriaan Moors | 2016-04-21 | 1 | -5/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5096 from lrytz/traitParents | Lukas Rytz | 2016-04-20 | 26 | -330/+639 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Ensure that lzycompute methods are entered into the scope | Lukas Rytz | 2016-04-20 | 2 | -8/+22 | |
| * | | | | | | Ensure ClassBTypes constructed from symbol and classfile are identical | Lukas Rytz | 2016-04-20 | 5 | -34/+59 | |
| * | | | | | | Clean up code gen for method invocations | Lukas Rytz | 2016-04-20 | 7 | -218/+324 | |
| * | | | | | | Move test run/origins.scala to pending | Lukas Rytz | 2016-04-12 | 3 | -0/+0 | |
| * | | | | | | SD-98 don't emit unnecessary mixin forwarders | Lukas Rytz | 2016-04-12 | 12 | -57/+223 | |
| * | | | | | | Rewrite JUnit tests to avoid `@Test` methods in traits | Lukas Rytz | 2016-04-12 | 1 | -14/+12 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | scala-dev-113: Sync root package words to layout (#5107) | Janek Bogucki | 2016-04-20 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5100 from lrytz/unitBox | Lukas Rytz | 2016-04-20 | 4 | -10/+133 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | SI-6710 / PR 5072 follow-up: fix Unit.box / Unit.unbox | Lukas Rytz | 2016-04-20 | 4 | -10/+133 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5098 from sjrd/simplify-scala-runtime | Lukas Rytz | 2016-04-20 | 16 | -343/+66 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove the unused scala.runtime.Boxed trait. | Sébastien Doeraene | 2016-04-13 | 1 | -12/+0 | |
| * | | | | | Remove plain old dead code in ScalaRunTime. | Sébastien Doeraene | 2016-04-13 | 2 | -66/+0 | |
| * | | | | | Do not rely on ScalaRunTime.{inlineEquals,hash} in JavaMirrors. | Sébastien Doeraene | 2016-04-13 | 1 | -3/+3 | |
| * | | | | | Move ScalaRunTime.box to typechecker.Macros. | Sébastien Doeraene | 2016-04-13 | 2 | -15/+14 | |
| * | | | | | Inline ScalaRunTime.arrayElementClass at call sites. | Sébastien Doeraene | 2016-04-13 | 7 | -33/+11 | |
| * | | | | | Move ScalaRunTime.isAnyVal to reify.phases.Reify. | Sébastien Doeraene | 2016-04-13 | 3 | -11/+5 | |
| * | | | | | Hide ScalaRunTime.isTuple inside stringOf. | Sébastien Doeraene | 2016-04-13 | 3 | -65/+10 | |
| * | | | | | Remove dead-code runtime hash() methods. | Sébastien Doeraene | 2016-04-13 | 6 | -94/+5 | |
| * | | | | | Inline ArrayRuntime methods in ScalaRunTime.array_clone(). | Sébastien Doeraene | 2016-04-13 | 3 | -44/+18 | |
| |/ / / / | ||||||
* / / / / | SI-9749 REPL strip lead ws on dot continuation (#5097) | som-snytt | 2016-04-15 | 3 | -7/+25 | |
|/ / / / | ||||||
* | | | | Merge pull request #5082 from lrytz/inlineImplClassCleanup | Lukas Rytz | 2016-04-07 | 19 | -338/+164 | |
|\ \ \ \ | ||||||
| * | | | | Fix InlineInfo attribute for nested module accessors | Lukas Rytz | 2016-04-07 | 2 | -34/+74 | |
| * | | | | Remove references to trait impl classes, mostly in doc comments | Lukas Rytz | 2016-04-07 | 11 | -85/+49 | |
| * | | | | Remove unused optimizer warnings related to trait impl classes | Lukas Rytz | 2016-04-04 | 2 | -30/+0 |