summaryrefslogtreecommitdiff
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2576 from retronym/ticket/7436Paul Phillips2013-05-231-0/+9
|\
| * SI-7436 Varargs awareness for super param aliasing.Jason Zaugg2013-05-211-0/+9
* | Merge pull request #2492 from paulp/pr/enter-elimination-modePaul Phillips2013-05-201-1/+1
|\ \
| * \ Merge remote-tracking branch 'origin/master' into pr/enter-elimination-modePaul Phillips2013-05-194-2/+7
| |\ \
| * \ \ Merge commit 'd93826f278' into pr/enter-elimination-modePaul Phillips2013-05-181-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' into HEADPaul Phillips2013-05-1627-16/+173
| | |\ \ \
| | * | | | Corralling Modes into a smaller pen.Paul Phillips2013-05-111-1/+1
* | | | | | Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3Jason Zaugg2013-05-2062-141/+129
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | SI-7494 Tests for status quoSom Snytt2013-05-1962-141/+129
* | | | | | An attempt to make tests deterministic.Paul Phillips2013-05-192-2/+2
* | | | | | SI-7427 stop crashing under -Ydebug.Paul Phillips2013-05-192-0/+5
| |/ / / / |/| | | |
* | | | | Merge 2.10.x into masterAdriaan Moors2013-05-175-0/+20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #2536 from adriaanm/ticket-7359Adriaan Moors2013-05-175-75/+21
| |\ \ \ \
| | * | | | [backport #1727] SI-7359 cyclic nested java classAdriaan Moors2013-05-165-75/+21
| * | | | | SI-7486 regression in implicit resolution.Paul Phillips2013-05-171-0/+8
* | | | | | Merge pull request #2518 from paulp/issue/1786Adriaan Moors2013-05-173-20/+19
|\ \ \ \ \ \
| * | | | | | No bounds-driven inference for the named.Paul Phillips2013-05-142-8/+11
| * | | | | | SI-1786 incorporate defined bounds in inferencePaul Phillips2013-05-124-25/+21
* | | | | | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroyAdriaan Moors2013-05-172-3/+55
|\ \ \ \ \ \ \
| * | | | | | | SI-6488 Interrupt i/o threads on process destroySom Snytt2013-05-152-3/+55
* | | | | | | | Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-masterAdriaan Moors2013-05-1743-30/+377
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-171255-8884/+9785
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2504 from scalamacros/ticket/7464Jason Zaugg2013-05-172-10/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-7464 allows FieldMirror.set to update valsEugene Burmako2013-05-172-10/+4
| * | | | | | | | | Merge pull request #2497 from scalamacros/topic/macro-qqqJason Zaugg2013-05-174-0/+33
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | easy way of writing not implemented macrosEugene Burmako2013-05-124-0/+33
| * | | | | | | | | | SI-5886 Remove check for packed type conformance.Jason Zaugg2013-05-151-0/+18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app...Adriaan Moors2013-05-141-0/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin...Viktor Klang2013-05-101-0/+19
| * | | | | | | | | Merge pull request #2494 from scalamacros/ticket/5923Eugene Burmako2013-05-1141-1/+208
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXXEugene Burmako2013-05-113-0/+33
| | * | | | | | | | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXXEugene Burmako2013-05-113-0/+22
| | * | | | | | | | | [nomaster] SI-7291: No exception throwing for diverging implicit expansionHubert Plociniczak2013-05-1112-1/+60
| | * | | | | | | | | [nomaster] SI-7167 implicit macros decide what is divergenceEugene Burmako2013-05-116-0/+57
| | * | | | | | | | | [nomaster] macroExpandAll is now triggered in all invocations of typedEugene Burmako2013-05-112-0/+4
| | * | | | | | | | | [nomaster] SI-5923 instantiates targs in deferred macro applicationsEugene Burmako2013-05-1113-0/+32
| | * | | | | | | | | [nomaster] temporarily breaks SI-5353Eugene Burmako2013-05-112-0/+0
| * | | | | | | | | | Merge pull request #2505 from scalamacros/topic/macrosPaul Phillips2013-05-112-0/+42
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fixes a crash in ReflectionUtils.systemPropertiesEugene Burmako2013-05-092-0/+42
| | |/ / / / / / / /
| * | | | | | | | | fixes a checkfile breakage in 2.10.xEugene Burmako2013-05-111-1/+1
| * | | | | | | | | Merge pull request #2456 from paulp/pr/jdk8-210xGrzegorz Kossakowski2013-05-119-8/+39
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-7398 Add support for java8 default methodsPaul Phillips2013-04-261-0/+31
| | * | | | | | | | | Refactor DirectTest so java can be tested.Paul Phillips2013-04-268-8/+8
| * | | | | | | | | | Merge pull request #2461 from scalamacros/ticket/7325Paul Phillips2013-05-1011-7/+141
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | SI-7325 cleans up corner cases of percent handling in StringContext.fEugene Burmako2013-05-047-3/+91
| | * | | | | | | | | | SI-7271 fixes positions of string interpolation partsEugene Burmako2013-04-274-4/+50
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #2458 from paulp/issue/7426-210Grzegorz Kossakowski2013-05-101-0/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | SI-7426 Crash in pickler.Paul Phillips2013-04-261-0/+3
| * | | | | | | | | | | Merge pull request #2488 from paulp/issue/7441Paul Phillips2013-05-102-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | SI-7441 Don't ramble on about inapplicable implicits.Paul Phillips2013-05-022-0/+13