summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'scala/master' into merge-2.10.xGrzegorz Kossakowski2013-07-2911-375/+543
|\
| * Merge pull request #2746 from soc/topic/paulp-typer-debug-outputAdriaan Moors2013-07-2911-375/+543
| |\
| | * Make -Ytyper-debug output readable.Paul Phillips2013-07-179-299/+481
| | * Cleanups in type printing.Paul Phillips2013-07-172-76/+62
* | | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.xGrzegorz Kossakowski2013-07-298-49/+250
|\ \ \ | |/ / |/| |
| * | Merge pull request #2750 from retronym/ticket/7455-2.10.xGrzegorz Kossakowski2013-07-271-2/+11
| |\ \
| | * | SI-7455 Drop dummy param for synthetic access constructorJason Zaugg2013-07-281-2/+11
| * | | Merge pull request #2738 from retronym/ticket/7636Grzegorz Kossakowski2013-07-271-0/+2
| |\ \ \
| | * | | SI-7636 Fix a NPE in typing class constructorsChristopher Vogt2013-07-161-0/+2
| * | | | Merge pull request #2762 from gourlaysama/t7687Grzegorz Kossakowski2013-07-271-1/+1
| |\ \ \ \
| | * | | | SI-7687 Handle spaces in %COMSPEC% path in scala.bat.Antoine Gourlay2013-07-231-1/+1
| * | | | | [backport] SI-7569 Fix end position in PostfixSelect treeFrançois Garillot2013-07-241-1/+1
| |/ / / /
| * / / / SI-7657 clarifies the "macro overrides method" ruleEugene Burmako2013-07-141-2/+2
| |/ / /
| * | | Merge pull request #2674 from richdougherty/2.10.x-si7336-try2Adriaan Moors2013-07-122-24/+197
| |\ \ \
| | * | | SI-7336 - Link flatMapped promises to avoid memory leaksRich Dougherty2013-07-062-24/+197
| | |/ /
| * | | Merge pull request #2666 from som-snytt/issue/7265-spec-at-leastAdriaan Moors2013-07-121-10/+25
| |\ \ \
| | * | | SI-7265 General test for spec versionSom Snytt2013-07-041-10/+25
| * | | | Merge pull request #2721 from retronym/ticket/7649Adriaan Moors2013-07-121-8/+8
| |\ \ \ \
| | * | | | SI-7649 Fix positions for reshaped tag materializersJason Zaugg2013-07-111-8/+8
| | | |/ / | | |/| |
| * | | | Merge pull request #2716 from SethTisue/terribly-important-typo-fixAdriaan Moors2013-07-122-2/+2
| |\ \ \ \
| | * | | | fix typo in BigInt/BigDecimal deprecation messagesSeth Tisue2013-07-082-2/+2
| | |/ / /
| * | | | Merge pull request #2689 from scalamacros/ticket/7617Adriaan Moors2013-07-122-3/+37
| |\ \ \ \
| | * | | | SI-7617 typedAssign no longer expands lhsEugene Burmako2013-07-091-1/+4
| | * | | | makes it more convenient to work with SuppressMacroExpansionAttachmentEugene Burmako2013-06-282-2/+33
| * | | | | SI-7638 Superaccessor lookup after specializationVlad Ureche2013-07-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2739 from retronym/ticket/7668Adriaan Moors2013-07-291-0/+3
|\ \ \ \ \
| * | | | | SI-7668 Better return type inheritance for dep. method typesJason Zaugg2013-07-161-0/+3
* | | | | | Merge pull request #2737 from retronym/ticket/7669Adriaan Moors2013-07-291-5/+16
|\ \ \ \ \ \
| * | | | | | SI-7669 Fix exhaustivity warnings for recursive ADTs.Jason Zaugg2013-07-171-5/+16
| |/ / / / /
* | | | | | Merge pull request #2690 from soc/SI-7620Adriaan Moors2013-07-291-7/+4
|\ \ \ \ \ \
| * | | | | | SI-7620 Remove floating-point-literals-without-digit-after-dotSimon Ochsenreither2013-06-281-7/+4
* | | | | | | Merge pull request #2733 from soc/SI-6811-textGrzegorz Kossakowski2013-07-271-0/+8
|\ \ \ \ \ \ \
| * | | | | | | SI-6811 Deprecate scala.textSimon Ochsenreither2013-07-141-0/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2751 from soc/SI-7592-defaultmapmodelGrzegorz Kossakowski2013-07-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | SI-7592 Deprecate s.c.m.DefaultMapModelSimon Ochsenreither2013-07-191-0/+1
* | | | | | | | Merge pull request #2754 from soc/SI-7679-remove-standardscalasettings-makeGrzegorz Kossakowski2013-07-271-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7679 Remove deprecated StandardScalaSettings#makeSimon Ochsenreither2013-07-201-2/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2756 from soc/SI-7681-dead-code-settinggroupGrzegorz Kossakowski2013-07-271-7/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7681 Remove dead code in s.t.n.s.AbsScalaSettingsSimon Ochsenreither2013-07-201-7/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2758 from soc/SI-7681-dead-code-phasesGrzegorz Kossakowski2013-07-273-60/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7681 Clean up scala.reflect.internal.util.TableDefSimon Ochsenreither2013-07-202-17/+8
| * | | | | | | | SI-7681 Remove scala.tools.nsc.PhasesSimon Ochsenreither2013-07-201-43/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2757 from soc/SI-7681-dead-code-changesGrzegorz Kossakowski2013-07-271-221/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7681 Remove s.t.n.d.Changes (dead code)Simon Ochsenreither2013-07-201-221/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2765 from retronym/ticket/7689Grzegorz Kossakowski2013-07-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7689 Fix typing regression with default argumentsJason Zaugg2013-07-241-1/+2
* | | | | | | | | Merge pull request #2766 from xuwei-k/request/mergeable-either-value-classGrzegorz Kossakowski2013-07-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MergeableEither extends AnyValxuwei-k2013-07-241-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2772 from som-snytt/issue/6123-fix-testGrzegorz Kossakowski2013-07-271-9/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-7695 Macro debug output on -explaintypesSom Snytt2013-07-271-9/+12
| |/ / / / / / / /