summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
*-. Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' ↵Paul Phillips2012-02-1710-10/+41
|\ \ | | | | | | | | | into develop
| | * Closes #5497.Hubert Plociniczak2012-02-185-2/+22
| | | | | | | | | | | | Chain contexts by sharing the error buffer, unless you explicitly create a silent context. Review by @odersky
| * | Closes #5452.Hubert Plociniczak2012-02-175-8/+19
| |/ | | | | | | | | | | | | | | Instead of trying to track the fallback attempts we rely on the context state to inform us which fallback is the last one. setError cannot always be called in NoBestMethodAlternativeError because inferMethodAlternative relies on side-effects. Review by @paulp.
* | Merge remote-tracking branch 'scalamacros/pullrequest/macros' into developPaul Phillips2012-02-1734-31/+242
|\ \
| * | Fixes miscellaneous macro bugsEugene Burmako2012-02-1734-31/+242
| |/
* | Merge branch 'develop'Paul Phillips2012-02-1736-117/+3516
|\ \
| * | Fix for "type _$1 defined twice".Paul Phillips2012-02-178-144/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually not a fix, only a workaround. Package objects strike again: you don't want to have existentials in there, like this: private val resolverFunction: PartialFunction[Throwable, Try[_]] = ... There are a few irrelevant-to-that-bug changes included which I did while debugging and figured I'd keep them. With this patch I can merge/am merging the scala.concurrent work.
| * | Merge remote-tracking branch 'phaller/execution-context' into feb17-alexPaul Phillips2012-02-1733-116/+3525
| |\ \
| | * | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-1612-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some tests so that they work now. The Transactions.scala test was failing when defined in scala.concurrent package, reporting that type `_$1` is defined twice. Until we figure out the reason for this, the package name in that test is renamed.
| | * | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-16643-9625/+16626
| | |\| | | | | | | | | | | | | | | | | Conflicts: src/library/scala/package.scala
| | * | Change the default reportFailure implementation.Aleksandar Prokopec2012-02-031-2/+3
| | | |
| | * | Fix typo in Future trait. Simplify recoverWith.Philipp Haller2012-02-031-5/+2
| | | |
| | * | Rename to recoverWith and fallbackTo in Future.aleksandar2012-02-011-2/+2
| | | |
| | * | Replaced Either with Try throughout scala.concurrent.Heather Miller2012-01-319-115/+122
| | | |
| | * | Add some missing methods, remove obsolete methods in futures.aleksandar2012-01-306-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | Remove `ensure`. Add `reportFailure` to execution contexts. Add `zip` to futures.
| | * | Refactor the Try monad a bit.aleksandar2012-01-301-45/+37
| | | |
| | * | Changed the comments a bit, removed on* methods on Try.aleksandar2012-01-301-55/+32
| | | |
| | * | Added first cut of Try type, refactored from twitter util.Heather Miller2012-01-301-0/+196
| | | |
| | * | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵Vojin Jovanovic2012-01-271-20/+66
| | |\ \ | | | | | | | | | | | | | | | execution-context
| | | * | Implement the ensure and andThen methods on futures.aleksandar2012-01-271-1/+56
| | | | |
| | | * | Change the implementation of the future failed projection.aleksandar2012-01-271-20/+11
| | | | |
| | * | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-25232-1921/+8738
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Removed the nondeterministic implicit. Added rescue.aleksandar2012-01-246-54/+74
| | | | |
| | * | | Fixed the way callbacks are handled. Removed executor from base future trait.aleksandar2012-01-234-14/+13
| | | | |
| | * | | Add implicit for duration.aleksandar2012-01-201-0/+7
| | | | |
| | * | | Add NonDeterministic evidence needed to call nondeterministic methods.aleksandar2012-01-196-54/+91
| | | | |
| | * | | Add implicit conversion for futures that enables calling nondeterministic ↵aleksandar2012-01-194-100/+113
| | | | | | | | | | | | | | | | | | | | methods.
| | * | | Deprecating some traits in scala.concurrent.aleksandar2012-01-1910-5/+23
| | | | |
| | * | | Fix `all` combinator on futures, refactor execution context, remove disabled ↵aleksandar2012-01-197-1262/+88
| | | | | | | | | | | | | | | | | | | | files.
| | * | | Added implementations for any and find on collections of futures.Heather Miller2012-01-193-7/+55
| | | | |
| | * | | Refactor concurrent package and execution contexts.aleksandar2012-01-167-55/+101
| | | | |
| | * | | Work in progress.brijest2012-01-166-19/+48
| | | | |
| | * | | Add execution context implementation to akka futures.aleksandar2012-01-163-32/+163
| | | | |
| | * | | Migrate akka promises. Changes to some of the interfaces.aleksandar2012-01-1310-51/+250
| | | | |
| | * | | Work in progress on porting akka promises and futures.aleksandar2012-01-137-184/+231
| | | | |
| | * | | Port of akka Future implementation in progress.aleksandar2012-01-125-17/+283
| | | | |
| | * | | Refactor await calls for awaitable objects to ready and result calls.aleksandar2012-01-124-117/+123
| | | | |
| | * | | Refactor blockable to awaitable on several places.aleksandar2012-01-124-6/+8
| | | | |
| | * | | Merge branch 'execution-context' of github.com:phaller/scala into ↵aleksandar2012-01-12318-5537/+8228
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | execution-context Conflicts: .gitignore
| | | * | | Update Future.onSuccess to take a PartialFunction.Philipp Haller2012-01-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | It has now the same signature as in Akka.
| | | * | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-09317-5526/+8219
| | | |\ \ \
| | * | | | | Changing trait CanBlock name to CanAwait.aleksandar2012-01-124-3/+9
| | |/ / / /
| | * | | | 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 ↵aleksandar2011-12-131-0/+338
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | execution-context
| | | * | | | Add Akka version of Futures TCK.Philipp Haller2011-12-131-0/+338
| | | | | | |
| | * | | | | Change promise method signature.aleksandar2011-12-132-2/+2
| | |/ / / /
| | * | | | Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-133-9/+37
| | | | | |