Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SI-5318 Make implicit divergence checking PolyType aware. | Jason Zaugg | 2012-05-25 | 8 | -35/+70 |
| | | | | | | | | | | Replaces the two active subclasses of `SymCollector` with direct use of traversal methods of `Type`. Wildcard free class type parameters, not just method type parameters, when stripping the core type of candidate implicits. The spec doesn't make any such distinction, and the enclosed test, t5318c, crashes without this change. | ||||
* | Merge pull request #581 from lrytz/t4812-unc | Adriaan Moors | 2012-05-19 | 2 | -3/+12 |
|\ | | | | | Fix SI-4812: handle trait method with Symbol as default for argument | ||||
| * | Fix 4812 | Lukas Rytz | 2012-05-19 | 2 | -3/+12 |
| | | | | | | | | Remove default arguments from parameter ValDefs in UnCurry. | ||||
* | | Merge pull request #578 from lrytz/wip/t5044-squashed | Adriaan Moors | 2012-05-19 | 5 | -3/+38 |
|\ \ | | | | | | | fix SI-5044: better error message on cyclic error and named/default args | ||||
| * | | better feedback for SI-5044 | Lukas Rytz | 2012-05-18 | 5 | -3/+38 |
| | | | |||||
* | | | Merge pull request #577 from lrytz/wip/t2488 | Adriaan Moors | 2012-05-19 | 5 | -1/+60 |
|\ \ \ | | | | | | | | | Fix SI-2488: allow named arg, in original position, before positionals | ||||
| * | | | Fix SI-2488 | Lukas Rytz | 2012-05-18 | 5 | -1/+60 |
| | | | | |||||
* | | | | Merge pull request #568 from hubertp/issue/5801 | Adriaan Moors | 2012-05-19 | 3 | -1/+41 |
|\ \ \ \ | |_|_|/ |/| | | | Fix SI-5801: error messages regression. | ||||
| * | | | Fixes SI-5801, error messages regression. Review by @adriaanm | Hubert Plociniczak | 2012-05-18 | 3 | -1/+41 |
| | | | | |||||
* | | | | Merge pull request #574 from axel22/issue/4461 | Josh Suereth | 2012-05-18 | 3 | -1/+23 |
|\ \ \ \ | | | | | | | | | | | Fixes SI-4461. | ||||
| * | | | | Fixes SI-4461. | Aleksandar Prokopec | 2012-05-18 | 3 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | No review. | ||||
* | | | | | Merge pull request #572 from lrytz/wip/t5544 | Adriaan Moors | 2012-05-18 | 7 | -1/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix SI-5544 | ||||
| * | | | | | Fix SI-5544 | Lukas Rytz | 2012-05-18 | 7 | -1/+30 |
| | |_|/ / | |/| | | | | | | | | | | | | | Type-check annotations in a context with a localDummy owner | ||||
* | | | | | Merge pull request #569 from phaller/wip-sip14-fixes-new | Adriaan Moors | 2012-05-18 | 10 | -83/+201 |
|\ \ \ \ \ | | | | | | | | | | | | | SIP-14: clean ups and fixes by @viktorklang | ||||
| * | | | | | SIP-14: clean ups and fixes | phaller | 2012-05-17 | 10 | -83/+201 |
| | | | | | | |||||
* | | | | | | Merge pull request #571 from lrytz/wip/t4138 | Josh Suereth | 2012-05-18 | 3 | -3/+14 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix 4138 | ||||
| * | | | | | Fix 4138 | Lukas Rytz | 2012-05-18 | 3 | -3/+14 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #567 from lrytz/wip/t3488 | Josh Suereth | 2012-05-18 | 2 | -0/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanm | ||||
| * | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanm | Lukas Rytz | 2012-05-16 | 2 | -0/+8 |
| |/ / / | |||||
* | | | | Merge pull request #566 from lrytz/wip/t4928 | Adriaan Moors | 2012-05-18 | 5 | -18/+36 |
|\ \ \ \ | | | | | | | | | | | Fix SI-4928 | ||||
| * | | | | Fix SI-4928 | Lukas Rytz | 2012-05-16 | 5 | -18/+36 |
| | |_|/ | |/| | | | | | | | | | | better error message when a parameter is first defined positionally, then with a named argument. | ||||
* | | | | Merge pull request #564 from scalamacros/topic/assertinresetattrs | Josh Suereth | 2012-05-17 | 6 | -22/+17 |
|\ \ \ \ | | | | | | | | | | | fixes resetAttrs | ||||
| * | | | | fixes resetAttrs | Eugene Burmako | 2012-05-17 | 6 | -22/+17 |
| | | | | | |||||
* | | | | | Merge pull request #563 from milessabin/feature/enrich-gentraversables | Josh Suereth | 2012-05-17 | 5 | -0/+105 |
|\ \ \ \ \ | |/ / / / |/| | | | | Added infrastructure to enable easy enrichment of GenTraversables. | ||||
| * | | | | Added infrastructure to enable easy enrichment of GenTraversables. | Miles Sabin | 2012-05-17 | 5 | -0/+105 |
| | | | | | |||||
* | | | | | Merge pull request #562 from retronym/ticket/5803 | Josh Suereth | 2012-05-17 | 3 | -1/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | A band-aid solution for SI-5803. | ||||
| * | | | | A band-aid solution for SI-5803. | Jason Zaugg | 2012-05-17 | 3 | -1/+10 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Since ae5ff662, resetAttrs duplicates trees, which doesn't preserve ApplyConstructor. My attempt to modify TreeCopier to do so proved trickier than expected. In any case, ApplyConstructor is not long for this world, and is only used in tree printing to distinguish `new X` from regular Apply trees, so this should suffice pending full surgery. | ||||
* | | | | Merge pull request #560 from heathermiller/issue/5623 | Adriaan Moors | 2012-05-17 | 1 | -7/+43 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixes SI-5623 on SyncVar. Deprecates set & unset. Review by @phaller. | ||||
| * | | | | Missed a stash | Heather Miller | 2012-05-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of git://github.com/scala/scala into issue/5623 | Heather Miller | 2012-05-16 | 22 | -41/+123 |
| |\| | | | |||||
| * | | | | Fixes SI-5623 on SyncVar and deprecates set & unset. | Heather Miller | 2012-05-16 | 1 | -7/+43 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #561 from retronym/topic/intellij-test-module | Adriaan Moors | 2012-05-17 | 3 | -20/+17 |
|\ \ \ \ | |_|/ / |/| | | | An IntelliJ module for test files. | ||||
| * | | | An IntelliJ module for test files. | Jason Zaugg | 2012-05-17 | 3 | -20/+17 |
|/ / / | | | | | | | | | | | | | | | | | | | This enables resolve, autocompletion and the usual goodness when editing tests. Also removes the sample configuration for the defunct dbc module. | ||||
* | | | Merge pull request #558 from lrytz/wip/t5259 | Josh Suereth | 2012-05-16 | 2 | -6/+27 |
|\ \ \ | | | | | | | | | Fix SI-5259 | ||||
| * | | | Fix SI-5259 | Lukas Rytz | 2012-05-15 | 2 | -6/+27 |
| | | | | | | | | | | | | | | | | Calling the type checker on an Ident tree instead of using gen.mkAttributedRef assigns a SingleType to the tree. | ||||
* | | | | Merge pull request #557 from lrytz/wip/t5610 | Josh Suereth | 2012-05-16 | 3 | -5/+47 |
|\ \ \ \ | | | | | | | | | | | Fix for SI-5610 | ||||
| * | | | | Fix for SI-5610 | Lukas Rytz | 2012-05-15 | 3 | -5/+47 |
| |/ / / | |||||
* | | | | Merge pull request #555 from srp/master | Josh Suereth | 2012-05-16 | 1 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | mutable.MapLike: override $mapNote to reflect actual require mutable api | ||||
| * | | | | mutable.MapLike: override $mapNote to reflect actual require mutable api | Scott R. Parish | 2012-05-15 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The api needed to define a mutable.Map is different then the one needed to define an immutable.Map. Prior to this patch the mutable one reflected the api needed for the immutable one causing confusion about what really needed to be defined. | ||||
* | | | | | Merge pull request #553 from heathermiller/doc/links | Josh Suereth | 2012-05-16 | 16 | -30/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Small documentation fixes & small fix to Scaladoc @see formatting | ||||
| * | | | | Corrects links in API documentation | Heather Miller | 2012-05-16 | 11 | -18/+16 |
| | | | | | |||||
| * | | | | Missed a straggling doc comment. | Heather Miller | 2012-05-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Small documentation fixes & small fix to Scaladoc @see formatting | Heather Miller | 2012-05-15 | 5 | -11/+10 |
| | | | | | |||||
* | | | | | Putting back things sbt noticed were gone. | Paul Phillips | 2012-05-15 | 3 | -0/+30 |
| | | | | | |||||
* | | | | | Removing more unneeded code. | Paul Phillips | 2012-05-15 | 44 | -1432/+128 |
| |/ / / |/| | | | |||||
* | | | | Test adjustments. | Paul Phillips | 2012-05-15 | 2 | -1/+4 |
| | | | | |||||
* | | | | Removing extraneous files. | Paul Phillips | 2012-05-15 | 93 | -6478/+56 |
| | | | | | | | | | | | | | | | | Culling accumulated unnecessary code. | ||||
* | | | | Merge pull request #554 from srp/master | Josh Suereth | 2012-05-15 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Enumeration#maxId: fix documentation to reflect reality | ||||
| * | | | | Enumeration#maxId: fix documentation to reflect reality | Scott R. Parish | 2012-05-15 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maxId is not really the "maximum id", but rather one past the max: scala> object Foo extends Enumeration { | val x = Value | val y = Value | } defined module Foo scala> Foo.maxId res0: Int = 2 scala> Foo(2) java.util.NoSuchElementException: key not found: 2 at scala.collection.MapLike$class.default(MapLike.scala:225) ... scala> Foo(1) res2: Foo.Value = y | ||||
* / / / | Fixed positions for `AnnotationInfo.original`. | Iulian Dragos | 2012-05-15 | 1 | -1/+5 |
|/ / / |