summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3037 from gkossakowski/fix-merge-3018v2.11.0-M6Grzegorz Kossakowski2013-10-1420-27/+411
|\
| * Merge remote-tracking branch 'scala/master' into fix-merge-3018Grzegorz Kossakowski2013-10-1464-581/+933
| |\
| * | Remove stray debug commentAdriaan Moors2013-10-081-2/+0
| * | Single Abstract Method support: java8 testAdriaan Moors2013-10-084-1/+37
| * | Extract SerialVersionUIDAnnotation. Make SAM body synthetic.Adriaan Moors2013-10-085-12/+18
| * | Don't pursue SAM translation after an arity mismatch.Jason Zaugg2013-10-084-2/+78
| * | Single Abstract Method support: synthesize SAMsAdriaan Moors2013-10-048-12/+76
| * | Single Abstract Method support: synthesis helpersAdriaan Moors2013-10-042-0/+192
| * | Clarify findMembers, add reverse engineered docsAdriaan Moors2013-10-041-5/+17
| * | Simplify partest.task target, fix typo in comment.Adriaan Moors2013-10-042-3/+3
* | | Merge pull request #3038 from retronym/topic/by-name-revertGrzegorz Kossakowski2013-10-145-3/+35
|\ \ \
| * | | SI-7899 Allow by-name inference under -Yinfer-by-nameJason Zaugg2013-10-145-3/+35
* | | | Merge pull request #3036 from paulp/pr/aestheticsPaul Phillips2013-10-132-76/+65
|\ \ \ \ | |_|_|/ |/| | |
| * | | Aesthetics in Trees.Paul Phillips2013-10-131-52/+52
| * | | Aesthetics in GenTrees.Paul Phillips2013-10-131-24/+13
|/ / /
* | | Merge pull request #3031 from retronym/topic/skip-docPaul Phillips2013-10-121-38/+40
|\ \ \
| * | | An ant property to skip building docsJason Zaugg2013-10-111-38/+40
* | | | Merge pull request #3032 from retronym/ticket/7239-testPaul Phillips2013-10-122-0/+16
|\ \ \ \
| * | | | SI-7239 A bonus test case from [scala-user]Jason Zaugg2013-10-112-0/+16
| |/ / /
* | | | Merge pull request #3024 from retronym/ticket/7895Paul Phillips2013-10-1230-70/+220
|\ \ \ \
| * | | | SI-7985 Typecheck args after failure to typecheck functionJason Zaugg2013-10-0911-13/+94
| * | | | SI-7895 Issue all buffered errors after silent mode.Jason Zaugg2013-10-0910-25/+101
| * | | | SI-7895 Avoid cascade of "symbol not found" in pattern matchesJason Zaugg2013-10-0911-35/+28
* | | | | Merge pull request #3025 from retronym/ticket/7902Paul Phillips2013-10-122-0/+18
|\ \ \ \ \
| * | | | | SI-7902 Fix spurious kind error due to an unitialized symbolJason Zaugg2013-10-092-0/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #3021 from paulp/pr/is-he-stable-or-is-he-volatilePaul Phillips2013-10-123-77/+85
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Extract isStable and isVolatile from Type.Paul Phillips2013-10-053-77/+85
| | |_|/ | |/| |
* | | | Merge pull request #3020 from paulp/pr/overriding-pairsJason Zaugg2013-10-0919-381/+514
|\ \ \ \ | |_|/ / |/| | |
| * | | Generalize OverridingPairs to SymbolPairs.Paul Phillips2013-10-0519-381/+514
| |/ /
* | | Merge pull request #3022 from retronym/ticket/7899Jason Zaugg2013-10-096-13/+35
|\ \ \ | |_|/ |/| |
| * | SI-7899 Don't infer by-name types during, e.g. eta-expansionJason Zaugg2013-10-076-13/+35
| |/
* | Merge pull request #3014 from ceedubs/pr/implicitNotFound-scaladocAdriaan Moors2013-10-071-2/+5
|\ \ | |/ |/|
| * Describe type parameter interpolation in @implicitNotFound documentationCody Allen2013-10-031-2/+5
* | Merge pull request #3005 from paulp/pr/7886Paul Phillips2013-10-0331-76/+221
|\ \
| * | SI-6680 unsoundness in gadt typing.Paul Phillips2013-10-0124-69/+185
| * | SI-7886 unsoundness in pattern matcher.Paul Phillips2013-10-018-12/+41
* | | Merge pull request #3015 from sschaef/eclipse-updateAdriaan Moors2013-10-031-1/+1
|\ \ \
| * | | Correct build command for scala-ideSimon Schaefer2013-10-031-1/+1
|/ / /
* | | Merge pull request #3013 from retronym/topic/unspec-fix-windowsAdriaan Moors2013-10-034-24/+22
|\ \ \
| * | | Rework cff8b569 to heal the windows build.Jason Zaugg2013-10-034-24/+22
* | | | Merge pull request #2973 from sschaef/eclipse-update3Adriaan Moors2013-10-0310-113/+58
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update of Eclipse project filesSimon Schaefer2013-09-2210-113/+58
* | | | Merge pull request #2965 from retronym/ticket/7859Grzegorz Kossakowski2013-10-0310-37/+147
|\ \ \ \
| * | | | SI-7859 Value classes may wrap a non-public memberJason Zaugg2013-09-2910-37/+147
* | | | | Merge pull request #2994 from xeno-by/topic/bundlesJason Zaugg2013-10-0329-43/+269
|\ \ \ \ \
| * | | | | macro bundles are now usable in replEugene Burmako2013-10-023-4/+43
| * | | | | gets rid of randomness in virtual filenames for bundlesEugene Burmako2013-10-022-11/+11
| * | | | | clearly establishes what macro bundles areEugene Burmako2013-10-0225-29/+216
| | |_|/ / | |/| | |
* | | | | Merge pull request #2977 from sjrd/topic/remove-classpath-logic-dependent-on-...Jason Zaugg2013-10-033-4/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add -Yno-load-impl-class disabling loading of $class.class files.Sébastien Doeraene2013-09-272-1/+11