diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-11 12:30:25 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-11 12:30:25 -0800 |
| commit | cc035b981118d173e790e081f1135f98503ba238 (patch) | |
| tree | 43d7673d9ba609f4b5bacb5834a79de48b44bbc1 /test/files/neg | |
| parent | c9bca57781ffa64e0d081facf668775f6eaff2e8 (diff) | |
| parent | 818a2e6597f23a82f848cd1f7d3b2e29129390a6 (diff) | |
| download | scala-cc035b981118d173e790e081f1135f98503ba238.tar.gz scala-cc035b981118d173e790e081f1135f98503ba238.tar.bz2 scala-cc035b981118d173e790e081f1135f98503ba238.zip | |
Merge pull request #1737 from retronym/ticket/6555
SI-6555 Better parameter name retention
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t6260.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t6260.check b/test/files/neg/t6260.check index 2b7f1a8bfb..46e9bd1dfc 100644 --- a/test/files/neg/t6260.check +++ b/test/files/neg/t6260.check @@ -1,10 +1,10 @@ -t6260.scala:3: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun +t6260.scala:3: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun which overrides method apply: (v1: T1)R in trait Function1 clashes with definition of the member itself; both have erased type (v1: Object)Object ((bx: Box[X]) => new Box(f(bx.x)))(this) ^ -t6260.scala:8: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun +t6260.scala:8: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun which overrides method apply: (v1: T1)R in trait Function1 clashes with definition of the member itself; both have erased type (v1: Object)Object |