summaryrefslogtreecommitdiff
path: root/test/files/pos
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2215 from paulp/issue/7228Paul Phillips2013-03-133-19/+76
|\
| * Simplified the widening logic.Paul Phillips2013-03-102-19/+1
| * SI-7228, bug in weak subtyping.Paul Phillips2013-03-101-0/+75
* | Merge 2.10.x into masterAdriaan Moors2013-03-123-0/+61
|\ \ | |/ |/|
| * Merge pull request #2225 from retronym/ticket/7234Adriaan Moors2013-03-112-0/+35
| |\
| | * SI-7234 Make named args play nice with dep. method typesJason Zaugg2013-03-092-0/+35
| * | SI-7226 Fix inference regression caused by TypeVar equality.Jason Zaugg2013-03-091-0/+26
| |/
* | Merge 2.10.x into master.Adriaan Moors2013-03-052-0/+14
|\|
| * Merge pull request #2193 from adriaanm/patmat-refactorAdriaan Moors2013-03-053-0/+25
| |\
| | * Merge 2.10.1 into 2.10.xAdriaan Moors2013-03-031-0/+11
| | |\
| | | * Merge pull request #2168 from retronym/ticket/7183Adriaan Moors2013-03-012-0/+14
| | | |\
| | | | * SI-7183 Disable unreachability for withFilter matches.Jason Zaugg2013-02-252-0/+14
| | * | | [port] SI-7183 Disable unreachability for withFilter matches.Adriaan Moors2013-03-032-0/+14
* | | | | Merge 2.10.x into master.Adriaan Moors2013-03-051-0/+26
|\| | | |
| * | | | Merge pull request #2178 from scalamacros/ticket/7190Paul Phillips2013-03-051-0/+26
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SI-7190 macros no longer give rise to bridgesEugene Burmako2013-02-271-0/+26
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge 2.10.x into master.Adriaan Moors2013-03-051-0/+11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| / / | | | |/ /
| | | * | Merge pull request #2167 from retronym/ticket/7126Adriaan Moors2013-03-011-0/+11
| | | |\ \
| | | | * | SI-7126 Account for the alias types that don't dealias.Jason Zaugg2013-02-251-0/+11
| | | | |/
* | | | | Merge branch 2.10.1 into masterAdriaan Moors2013-02-271-0/+13
|\| | | |
| * | | | Merge 2.10.1 into 2.10.x.Adriaan Moors2013-02-271-0/+13
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * / SI-7180 Fix regression in implicit scope of HK type alias.Jason Zaugg2013-02-251-0/+13
| | |/
| | * Additional test case for Lukas' fix to annotated originals.Jason Zaugg2013-02-212-0/+14
* | | Merge 2.10.x into master.Adriaan Moors2013-02-205-0/+49
|\| |
| * | Merge pull request #2118 from lrytz/annotatedRetypingJames Iry2013-02-192-0/+14
| |\ \
| | * | Additional test case for Lukas' fix to annotated originals.Jason Zaugg2013-02-182-0/+14
| * | | SI-5744 evidence params are now SYNTHETICUladzimir Abramchuk2013-02-162-0/+28
| * | | Merge pull request #2115 from retronym/ticket/7091Adriaan Moors2013-02-121-0/+7
| |\ \ \ | | |/ / | |/| |
| | * | SI-7091 Don't try to put a protected accessor in a package.Jason Zaugg2013-02-111-0/+7
| | |/
* | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-masterAdriaan Moors2013-02-122-0/+31
|\| |
| * | Merge pull request #2111 from retronym/2.10.xJames Iry2013-02-111-0/+11
| |\ \
| | * | SI-6514 Avoid spurious dead code warningsJason Zaugg2013-02-101-0/+11
| | |/
| * / SI-6225 Fix import of inherited package object implicitsJason Zaugg2013-02-091-0/+20
| |/
* | Merge pull request #2057 from paulp/pr/revert-6355Paul Phillips2013-02-121-0/+16
|\ \
| * | SI-6355, weakend implementation restriction on applyDynamic.Paul Phillips2013-02-121-0/+16
* | | Maintenance of Predef.Paul Phillips2013-02-1238-163/+163
|/ /
* | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2013-02-109-5/+81
|\|
| * Merge pull request #2017 from retronym/ticket/6666James Iry2013-02-081-47/+0
| |\
| * \ Merge pull request #2088 from retronym/ticket/6146James Iry2013-02-072-0/+61
| |\ \
| | * | SI-6146 More accurate prefixes for sealed subtypes.Jason Zaugg2013-02-072-0/+61
| * | | Merge pull request #2079 from JamesIry/2.10.x_SI-7070James Iry2013-02-075-5/+0
| |\ \ \
| | * | | SI-7070 Turn restriction on companions in pkg objs into warningJames Iry2013-02-065-5/+0
| * | | | Merge pull request #1995 from retronym/ticket/5082James Iry2013-02-071-0/+14
| |\ \ \ \
| | * | | | SI-5082 Cycle avoidance between case companionsJason Zaugg2013-02-071-0/+14
| | |/ / /
| * | | | SI-7100 Fixed infinite recursion in duplicatorsVlad Ureche2013-02-071-0/+6
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge commit 'b43ae58f31'; commit 'b579a42ee3'; commit '81fa831609' into merg...Paul Phillips2013-02-101-47/+0
|\ \ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Move a test from pos to run to highlight bytecode deficiencies.Jason Zaugg2013-01-281-47/+0
* | | | | | Merge commit '558c059227' into merge-210Paul Phillips2013-02-092-0/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2059 from VladUreche/issue/7060James Iry2013-02-062-0/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-7060 More conservative dead code elim markingVlad Ureche2013-02-052-0/+12
| | | |_|/ | | |/| |