Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge remote-tracking branches 'jsuereth/2.10.0-milestones' and ↵ | Paul Phillips | 2012-02-20 | 3 | -2/+54 | |
|\ | | | | | | | 'szabolcsberecz/SI-5215' into develop | |||||
| * | Fix for SI-5215 part 2: generate return value when eliding method calls | Szabolcs Berecz | 2012-02-20 | 3 | -2/+54 | |
| | | ||||||
* | | Speed up deployment using combined deploy settings. | Josh Suereth | 2012-02-20 | 1 | -36/+10 | |
| | | ||||||
* | | Fixed POM for sonatypes standards.v2.10.0-M2 | Josh Suereth | 2012-02-20 | 8 | -0/+96 | |
| | | ||||||
* | | Added the ability to publish signed artifacts. | Josh Suereth | 2012-02-20 | 1 | -2/+102 | |
| | | ||||||
* | | Javadoc + Source jar generation is now complete for maven deployment. | Josh Suereth | 2012-02-20 | 3 | -48/+166 | |
|/ | ||||||
* | A better error message for inheritance conflict. | Paul Phillips | 2012-02-19 | 5 | -1/+66 | |
| | | | | | | And some tests for pending. Closes SI-5358. | |||||
* | Streamlining skolemization, specialization. | Paul Phillips | 2012-02-19 | 6 | -58/+75 | |
| | | | | | | Skolemization code doesn't belong in Typers. I carved out a little place for it. Also simplifications in specialization. | |||||
* | Merge remote-tracking branch 'TiarkRompf/SI-5506' into develop | Paul Phillips | 2012-02-19 | 4 | -7/+115 | |
|\ | ||||||
| * | fixes SI-5506. better cps type propagation for polymorphic and ↵ | Tiark Rompf | 2012-02-19 | 4 | -7/+115 | |
| | | | | | | | | multi-argument list methods. | |||||
* | | Merge remote-tracking branch 'szabolcsberecz/SI-5215' into develop | Paul Phillips | 2012-02-19 | 4 | -17/+52 | |
|\ \ | ||||||
| * | | Fix for SI-5215: scalac crash when @elidable used in trait | Szabolcs Berecz | 2012-02-19 | 4 | -17/+52 | |
| | | | | | | | | | | | | The elision is now done by not emitting method calls (it was done by removing the elidable methods). | |||||
* | | | Specialize Tuple2 on more types. | Paul Phillips | 2012-02-19 | 2 | -2/+2 | |
|/ / | | | | | | | This one is a no-brainer now. | |||||
* | | Fix [@spec A] to correctly induce AnyRef specialization. | Erik Osheim | 2012-02-19 | 2 | -20/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | While [@specialized A] already tries to include specialization, a bug in specializedOn prevented this from happening: any empty list could mean that the type var was unspecialized, or that it was specialized on everything. The fix is to have this function create the full list of symbols in the case where the @specialized annotation doesn't explicitly include any types. | |||||
* | | Merge remote-tracking branch 'phaller/execution-context' | Paul Phillips | 2012-02-19 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix race condition in scala-concurrent-tck test | Philipp Haller | 2012-02-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | More specialization tests. | Paul Phillips | 2012-02-19 | 8 | -6/+93 | |
| | | | | | | | | | | | | Some in pending, some in files. Closes SI-4770. | |||||
* | | | More on SI-5500. | Paul Phillips | 2012-02-18 | 9 | -63/+142 | |
| | | | | | | | | | | | | | | | | | | A reimagining of erik's patch in 1df4fc6e59 . He did the hard part, this is the batman reboot. I added more tests and tried to make the anyref caching code less fragile. | |||||
| | | | ||||||
| \ \ | ||||||
*-. \ \ | Merge branch 'master', remote-tracking branch 'non/si-5500' into develop | Paul Phillips | 2012-02-18 | 14 | -57/+60 | |
|\ \ \ \ | ||||||
| | * | | | Fixed over-optimistic anyrefSpecCache (closes SI-5500). | Erik Osheim | 2012-02-19 | 3 | -6/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic problem here was that generic type params were getting confused between the various specialized subclasses. For instance, calling typeParamsSubAnyRef(A, C2$mcLI$sp) might return the wrong specialized type param, e.g. C2$mcLZ$sp.A$sp (note the Z instead of the I). The fix is to cache with both the sym (A) and also the clazz (C2$mcLI$sp). This may resolve a whole host of other obscure AnyRef specialization problems. | |||||
| * | | | | Cleanup in aisle New. | Paul Phillips | 2012-02-18 | 12 | -51/+37 | |
| | | | | | | | | | | | | | | | | | | | | More trees created more uniformly. | |||||
| | | | | | ||||||
| \ \ \ \ | ||||||
*-. \ \ \ \ | Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' ↵ | Paul Phillips | 2012-02-17 | 10 | -10/+41 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | into develop | |||||
| | * | | | | Closes #5497. | Hubert Plociniczak | 2012-02-18 | 5 | -2/+22 | |
| | | |_|/ | | |/| | | | | | | | | | | | | Chain contexts by sharing the error buffer, unless you explicitly create a silent context. Review by @odersky | |||||
| * / | | | Closes #5452. | Hubert Plociniczak | 2012-02-17 | 5 | -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 develop | Paul Phillips | 2012-02-17 | 34 | -31/+242 | |
|\ \ \ \ | ||||||
| * | | | | Fixes miscellaneous macro bugs | Eugene Burmako | 2012-02-17 | 34 | -31/+242 | |
| |/ / / | ||||||
* | | | | Merge branch 'develop' | Paul Phillips | 2012-02-17 | 36 | -117/+3516 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Fix for "type _$1 defined twice". | Paul Phillips | 2012-02-17 | 8 | -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-alex | Paul Phillips | 2012-02-17 | 33 | -116/+3525 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Disable execution context and futures implementation in the default package. | Aleksandar Prokopec | 2012-02-16 | 12 | -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-context | Aleksandar Prokopec | 2012-02-16 | 643 | -9625/+16626 | |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/package.scala | |||||
| | * | | Change the default reportFailure implementation. | Aleksandar Prokopec | 2012-02-03 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Fix typo in Future trait. Simplify recoverWith. | Philipp Haller | 2012-02-03 | 1 | -5/+2 | |
| | | | | ||||||
| | * | | Rename to recoverWith and fallbackTo in Future. | aleksandar | 2012-02-01 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Replaced Either with Try throughout scala.concurrent. | Heather Miller | 2012-01-31 | 9 | -115/+122 | |
| | | | | ||||||
| | * | | Add some missing methods, remove obsolete methods in futures. | aleksandar | 2012-01-30 | 6 | -36/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Remove `ensure`. Add `reportFailure` to execution contexts. Add `zip` to futures. | |||||
| | * | | Refactor the Try monad a bit. | aleksandar | 2012-01-30 | 1 | -45/+37 | |
| | | | | ||||||
| | * | | Changed the comments a bit, removed on* methods on Try. | aleksandar | 2012-01-30 | 1 | -55/+32 | |
| | | | | ||||||
| | * | | Added first cut of Try type, refactored from twitter util. | Heather Miller | 2012-01-30 | 1 | -0/+196 | |
| | | | | ||||||
| | * | | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵ | Vojin Jovanovic | 2012-01-27 | 1 | -20/+66 | |
| | |\ \ | | | | | | | | | | | | | | | | execution-context | |||||
| | | * | | Implement the ensure and andThen methods on futures. | aleksandar | 2012-01-27 | 1 | -1/+56 | |
| | | | | | ||||||
| | | * | | Change the implementation of the future failed projection. | aleksandar | 2012-01-27 | 1 | -20/+11 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into execution-context | Vojin Jovanovic | 2012-01-25 | 232 | -1921/+8738 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Removed the nondeterministic implicit. Added rescue. | aleksandar | 2012-01-24 | 6 | -54/+74 | |
| | | | | | ||||||
| | * | | | Fixed the way callbacks are handled. Removed executor from base future trait. | aleksandar | 2012-01-23 | 4 | -14/+13 | |
| | | | | | ||||||
| | * | | | Add implicit for duration. | aleksandar | 2012-01-20 | 1 | -0/+7 | |
| | | | | | ||||||
| | * | | | Add NonDeterministic evidence needed to call nondeterministic methods. | aleksandar | 2012-01-19 | 6 | -54/+91 | |
| | | | | | ||||||
| | * | | | Add implicit conversion for futures that enables calling nondeterministic ↵ | aleksandar | 2012-01-19 | 4 | -100/+113 | |
| | | | | | | | | | | | | | | | | | | | | methods. | |||||
| | * | | | Deprecating some traits in scala.concurrent. | aleksandar | 2012-01-19 | 10 | -5/+23 | |
| | | | | | ||||||
| | * | | | Fix `all` combinator on futures, refactor execution context, remove disabled ↵ | aleksandar | 2012-01-19 | 7 | -1262/+88 | |
| | | | | | | | | | | | | | | | | | | | | files. |