summaryrefslogtreecommitdiff
path: root/test
Commit message (Expand)AuthorAgeFilesLines
...
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge remote-tracking branches 'som-snytt/elide-nothing', 'szabolcsberecz/SI-...Paul Phillips2012-02-217-1/+64
|\ \ \ \ \
| | | * | | Test for SI-5171Szabolcs Berecz2012-02-212-0/+8
| |_|/ / / |/| | | |
| | * | | Test for SI-5316Szabolcs Berecz2012-02-212-1/+20
| |/ / / |/| | |
| * | | Disallow eliding when Nothing is expectedSom Snytt2012-02-213-0/+36
|/ / /
* | | Eliminating duplication in zero creation.Paul Phillips2012-02-202-2/+2
* | | Fix for SI-5215 part 2: generate return value when eliding method callsSzabolcs Berecz2012-02-202-2/+40
* | | A better error message for inheritance conflict.Paul Phillips2012-02-194-0/+57
* | | Merge remote-tracking branch 'TiarkRompf/SI-5506' into developPaul Phillips2012-02-192-0/+65
|\ \ \
| * | | fixes SI-5506. better cps type propagation for polymorphic and multi-argument...Tiark Rompf2012-02-192-0/+65
* | | | Fix for SI-5215: scalac crash when @elidable used in traitSzabolcs Berecz2012-02-192-2/+46
* | | | Fix [@spec A] to correctly induce AnyRef specialization.Erik Osheim2012-02-191-4/+4
* | | | Merge remote-tracking branch 'phaller/execution-context'Paul Phillips2012-02-191-1/+1
|\ \ \ \
| * | | | Fix race condition in scala-concurrent-tck testPhilipp Haller2012-02-191-1/+1
* | | | | More specialization tests.Paul Phillips2012-02-198-6/+93
* | | | | More on SI-5500.Paul Phillips2012-02-185-29/+101
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge branch 'master', remote-tracking branch 'non/si-5500' into developPaul Phillips2012-02-182-0/+14
|\ \ \ \ \ \
| | * | | | | Fixed over-optimistic anyrefSpecCache (closes SI-5500).Erik Osheim2012-02-192-0/+14
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' ...Paul Phillips2012-02-177-0/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Closes #5497.Hubert Plociniczak2012-02-184-0/+16
| | | |_|/ / / | | |/| | | |
| * / | | | | Closes #5452.Hubert Plociniczak2012-02-173-0/+0
| |/ / / / /
* | | | | | Merge remote-tracking branch 'scalamacros/pullrequest/macros' into developPaul Phillips2012-02-1730-0/+167
|\ \ \ \ \ \
| * | | | | | Fixes miscellaneous macro bugsEugene Burmako2012-02-1730-0/+167
| |/ / / / /
* | | | | | Merge remote-tracking branch 'phaller/execution-context' into feb17-alexPaul Phillips2012-02-175-1/+943
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-164-19/+20
| * | | | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-16346-698/+6271
| |\| | |
| * | | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-2581-60/+5573
| |\ \ \ \
| * | | | | Migrate akka promises. Changes to some of the interfaces.aleksandar2012-01-131-7/+5
| * | | | | Port of akka Future implementation in progress.aleksandar2012-01-121-1/+14
| * | | | | Refactor await calls for awaitable objects to ready and result calls.aleksandar2012-01-121-37/+49
| * | | | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-09105-136/+1401
| |\ \ \ \ \
| * | | | | | Make base TCK more uniform with Akka TCKPhilipp Haller2011-12-131-3/+4
| * | | | | | Add test for recover to Akka TCKPhilipp Haller2011-12-132-4/+25
| * | | | | | Force output of exception in assert. Add tests for recover.Philipp Haller2011-12-131-2/+33
| * | | | | | Add tests for blocking/await to Akka version of the TCKPhilipp Haller2011-12-131-6/+37
| * | | | | | Merge branch 'execution-context' of github.com:phaller/scala into execution-c...aleksandar2011-12-131-0/+338
| |\ \ \ \ \ \
| | * | | | | | Add Akka version of Futures TCK.Philipp Haller2011-12-131-0/+338
| * | | | | | | Change promise method signature.aleksandar2011-12-131-1/+1
| |/ / / / / /
| * | | | | | Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-131-3/+27
| * | | | | | Rename block->await. Add more tck test cases.aleksandar2011-12-131-8/+87
| * | | | | | Add stubs for future combinator tests.Philipp Haller2011-12-131-1/+67
| * | | | | | Fix default.ExecutionContextImpl.promise. Add promise test.Philipp Haller2011-12-131-1/+24
| * | | | | | Adding the tck test file.aleksandar2011-12-121-0/+166
| * | | | | | Merge branch 'execution-context' of github.com:phaller/scala into execution-c...aleksandar2011-12-121-8/+7
| |\ \ \ \ \ \
| | * | | | | | Fix future testsPhilipp Haller2011-12-091-5/+5
| * | | | | | | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-121-5/+10
| |/ / / / / /
| * | | | | | Add tests for future callbacksPhilipp Haller2011-12-072-0/+134
* | | | | | | Merge branch 'develop'Paul Phillips2012-02-177-3/+88
|\ \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge remote-tracking branches 'VladUreche/issue/5005', 'adriaanm/topic/virtp...Paul Phillips2012-02-176-2/+83
| |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | [vpm] generate proper isDefinedAt for switchesAdriaan Moors2012-02-172-1/+26
| | * | | | | | | [vpm] working type switch for try/catchAdriaan Moors2012-02-174-1/+57
| | |/ / / / / /