summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add future method to ExecutionContext trait. Log uncaught exceptions to stderr.Philipp Haller2011-12-073-16/+26
* Fixing match errors in the on* callback methods in future.Aleksandar Prokopec2011-12-071-7/+8
* The isTimedout on fj futures fixed.Aleksandar Prokopec2011-12-071-1/+1
* Got the futures and execution contexts related code to compile.Aleksandar Prokopec2011-12-076-55/+132
* Merge branch 'master' of https://github.com/scala/scala into execution-contextAleksandar Prokopec2011-12-07176-55/+1375
|\
| * Merge remote-tracking branch 'soc/scaladoc-spacing' into developPaul Phillips2011-12-062-11/+10
| |\
| | * Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-062-11/+10
| * | Merge branch 'master' of /scala/trunk into developPaul Phillips2011-12-061-0/+5
| |\ \
| | * | Gave Option its own nonEmpty.Paul Phillips2011-12-061-0/+5
| * | | Merge remote-tracking branches 'blair/documentation-typo-fix' and 'blair/remo...Paul Phillips2011-12-0622-25/+25
| |\ \ \
| | * | | Fix documentation stutters.Blair Zajac2011-12-0622-25/+25
| | |/ /
| * / / Fix documentation typo.Blair Zajac2011-12-061-1/+1
| |/ /
| * | Update scaladoc links to collections overview.Josh Marcus2011-12-0628-38/+34
| | |
| | \
| *-. \ Merge remote-tracking branches 'kepler/topic/dumpclasses' and 'joshmarcus/col...Paul Phillips2011-12-0530-3/+93
| |\ \ \
| | | * | Enhanced scaladoc of collection classes with links to the relevant pages of "...Josh Marcus2011-12-0527-0/+68
| | * | | -Ydump-classes: the option to dump the generated bytecodeluajalla2011-12-053-3/+25
| * | | | Disabled non-deterministic tests.Paul Phillips2011-12-0561-0/+0
| | | | |
| | \ \ \
| *-. \ \ \ Merge remote-tracking branches 'kepler/topic/reifycopypaste' and 'kepler/topi...Paul Phillips2011-12-0560-1/+1201
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | | * | | Another test pack for reflectionEugene Burmako2011-12-0559-0/+1200
| | * | | | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| | |/ / /
| * | | | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
| * | | | Merge remote-tracking branch 'szeiger/fix/scala-script-on-mingw'Paul Phillips2011-12-051-5/+17
| |\ \ \ \
| | * | | | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| | |/ / /
| * | | | Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
| |\ \ \ \
| | * | | | Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| | |/ / /
| * / / / Tweaks to get-scala-revision.Paul Phillips2011-12-052-3/+10
| |/ / /
* | | | Implementation of the fj task and future.Aleksandar Prokopec2011-12-076-109/+175
* | | | A slight refactoring in promise and task factory methods.Aleksandar Prokopec2011-12-071-2/+2
* | | | Adding some comments to block on. Removing timeout parameters.Aleksandar Prokopec2011-12-064-9/+31
* | | | Completed default implementations of monadic ops on futures.Aleksandar Prokopec2011-12-051-6/+50
* | | | Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Aleksandar Prokopec2011-12-051-0/+1051
|\ \ \ \
| * | | | Add Akka's future implementation for referencePhilipp Haller2011-12-051-0/+1051
* | | | | The default implementations for some of the future methods.Aleksandar Prokopec2011-12-054-15/+85
|/ / / /
* / / / Migration of scala.concurrent to clean fork of new Scala repo.Philipp Haller2011-12-058-0/+968
|/ / /
* | | Use git-describe to create build string.Paul Phillips2011-12-043-51/+15
* | | Merge remote-tracking branch 'kepler/topic/reifytests'Paul Phillips2011-12-0428-0/+352
|\ \ \
| * | | Test pack for various flavors of reflection.Eugene Burmako2011-12-0528-0/+352
* | | | Enabled continuations plugin by default.Paul Phillips2011-12-043-15/+12
* | | | Merge remote-tracking branch 'origin/develop'Paul Phillips2011-12-040-0/+0
|\ \ \ \
| * | | | Revert "Fixes the annoying spaces between name, type params and params in Sca...Paul Phillips2011-12-021-3/+4
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----. \ \ \ Merge remote-tracking branches 'dcsobral/parser/NoSuccessMessages', 'dcsobral...Paul Phillips2011-12-0212-15/+295
| |\ \ \ \ \ \ \
| | | | | * | | | Added better warning message if you've forgotten to run pull-binary-libs.sh a...Josh Suereth2011-12-021-0/+2
| | * | | | | | | Add filter/withFilter method to Parser, to complement map and flatMap when usedDaniel Capo Sobral2011-12-025-0/+51
| | | |_|/ / / / | | |/| | | | |
| * / | | | | | Add withErrorMessage and withFailureMessage to Parsers.Parser,Daniel C. Sobral2011-12-023-0/+95
| |/ / / / / /
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Merge remote-tracking branches 'kepler/topic/reifyclasses' and 'ijuma/feature...Paul Phillips2011-12-049-12/+36
|\ \ \ \ \ \ \ \
| | * | | | | | | Delegate to Java's implementation of signum for Long and Int.Ismael Juma2011-12-032-9/+18
| * | | | | | | | Reification of classes now produces trees that can be compiled and run.Eugene Burmako2011-12-047-3/+18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Add a mnemonic to help remember what's the difference between +:Daniel C. Sobral2011-12-042-0/+8
* | | | | | | | Tweaked ident suggestions.Paul Phillips2011-12-048-28/+22
|/ / / / / / /
* | | | | | | Added -Ysuggest-idents.Paul Phillips2011-12-037-15/+119
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 17:53:05 +0000