Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge remote-tracking branch 'origin/2.10.x' into fix-duration-issues-RK | Roland | 2012-09-12 | 47 | -450/+627 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | restrict Deadline to finite durations (would have to throw otherwise) | Roland | 2012-09-12 | 1 | -9/+10 | |
| * | | | | | | make private methods private[this] to avoid conflicts when importing Duration._ | Roland | 2012-09-12 | 1 | -15/+15 | |
| * | | | | | | retronym had one more improvement hidden up his sleeve for Duration | Roland | 2012-09-12 | 1 | -7/+9 | |
| * | | | | | | factor out more constants in Duration, thanks paulp! | Roland | 2012-09-12 | 1 | -8/+18 | |
| * | | | | | | two more minor cleanups to Duration | Roland | 2012-09-11 | 2 | -3/+13 | |
| * | | | | | | fix two minor issues in Duration | Roland | 2012-09-09 | 1 | -15/+14 | |
| * | | | | | | fix some one more issue in Duration | Roland | 2012-09-07 | 1 | -54/+79 | |
| * | | | | | | second round of Duration cleanup | Roland | 2012-09-07 | 1 | -97/+425 | |
| * | | | | | | several fixes to scala.concurrent.util.Duration | Roland | 2012-09-05 | 1 | -9/+58 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #1288 from jsuereth/fix/SI-6268 | Josh Suereth | 2012-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fixes SI-6268. Review by @paulp and @lrytz. | Josh Suereth | 2012-09-12 | 1 | -1/+1 | |
* | | | | | | Avoid spurious warning for `def foo = x.foo`. | Jason Zaugg | 2012-09-11 | 1 | -1/+6 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #1279 from rkuhn/fix-duration-usage | Josh Suereth | 2012-09-11 | 8 | -35/+82 | |
|\ \ \ \ \ | ||||||
| * | | | | | improve docs and Promise impl | Roland | 2012-09-11 | 4 | -34/+64 | |
| * | | | | | fix usage of Duration in Promise impl | Roland | 2012-09-10 | 7 | -15/+32 | |
* | | | | | | Merge pull request #1286 from paulp/topic/inliner-logging | Josh Suereth | 2012-09-11 | 21 | -240/+264 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch '2.10.x' into topic/inliner-logging | Paul Phillips | 2012-09-11 | 56 | -982/+811 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Large logging cleanup effort. | Paul Phillips | 2012-09-01 | 18 | -211/+220 | |
| * | | | | | | | Took measures to quiet down specialization logging. | Paul Phillips | 2012-09-01 | 2 | -14/+24 | |
| * | | | | | | | Worked around SI-6161 by annotating abstract type. | Paul Phillips | 2012-09-01 | 5 | -9/+13 | |
| * | | | | | | | Added a heuristic to the inliner. | Paul Phillips | 2012-09-01 | 1 | -9/+11 | |
* | | | | | | | | Merge pull request #1262 from jsuereth/fix/SI-6271 | Josh Suereth | 2012-09-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixes SI-6271 - Missing isEmpty override for views. | Josh Suereth | 2012-09-06 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #1274 from retronym/ticket/6335 | Grzegorz Kossakowski | 2012-09-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | SI-6335 More precise location of the implicit class synthetic method. | Jason Zaugg | 2012-09-09 | 1 | -2/+2 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1284 from retronym/topic/deprecated-inheritance | Grzegorz Kossakowski | 2012-09-11 | 8 | -0/+74 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Pull request feedback | Jason Zaugg | 2012-09-11 | 1 | -1/+1 | |
| * | | | | | | | | Rescues @deprecated{Inheritance, Overriding} | Jason Zaugg | 2012-09-11 | 4 | -12/+11 | |
| * | | | | | | | | Adds @deprecatedInheritance to BigInt and BigDecimal | Simon Ochsenreither | 2012-09-10 | 2 | -0/+2 | |
| * | | | | | | | | SI-6162 Adds @deprecatedInheritance/@deprecatedOverriding | Simon Ochsenreither | 2012-09-10 | 6 | -0/+73 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #1275 from retronym/ticket/6276 | Grzegorz Kossakowski | 2012-09-11 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | SI-6276 Warn on def or val that trivially loops infinitely | Jason Zaugg | 2012-09-09 | 1 | -0/+13 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1282 from retronym/topic/erasure-cleanup | Josh Suereth | 2012-09-10 | 3 | -8/+8 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Minor cleanups of code/comments related to value classes | Jason Zaugg | 2012-09-10 | 3 | -8/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1270 from paulp/issue/6327 | Josh Suereth | 2012-09-10 | 1 | -7/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix for SI-6327, wrongness in Dynamic. | Paul Phillips | 2012-09-08 | 1 | -7/+13 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #1269 from jsuereth/wip/si-6333 | Josh Suereth | 2012-09-10 | 1 | -23/+40 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Minor code style alterations and performance fixes. | Josh Suereth | 2012-09-07 | 1 | -10/+7 | |
| * | | | | | | Fix for SI-6333 - Try throws from combinators. | Josh Suereth | 2012-09-07 | 1 | -13/+33 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1277 from som-snytt/issue-2.10/6278-inline-class-synth-def | Josh Suereth | 2012-09-10 | 1 | -0/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SI-6278 fixed: synthetic implicit def must sort with its associated implicit ... | Som Snytt | 2012-09-09 | 1 | -0/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1278 from soc/remove-scalaruntime-try | Josh Suereth | 2012-09-10 | 1 | -29/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SI-6345 Remove scala.runtime.ScalaRunTime.Try | Simon Ochsenreither | 2012-09-10 | 1 | -29/+0 | |
| |/ / / / / | ||||||
* / / / / / | Makes getClass of a value class work. | Martin Odersky | 2012-09-08 | 2 | -2/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1265 from scalamacros/ticket/6318 | Josh Suereth | 2012-09-06 | 1 | -1/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | SI-6318 fixes ClassTag.unapply for primitives | Eugene Burmako | 2012-09-06 | 1 | -1/+20 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1268 from scalamacros/topic/removes-islocatable | Josh Suereth | 2012-09-06 | 2 | -13/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | removes isLocatable from the public API | Eugene Burmako | 2012-09-06 | 2 | -13/+10 | |
* | | | | | | Merge pull request #1267 from scalamacros/ticket/6246 | Eugene Burmako | 2012-09-06 | 2 | -24/+38 | |
|\ \ \ \ \ \ |