diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 21:28:23 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 21:28:23 -0800 |
commit | 816bcdf382ea0469f6c5eadcff44901921ba6075 (patch) | |
tree | 7d48f0ad3854f83bbe7543f130e67ce59cdc51d5 /test/files/run/idempotency-case-classes.check | |
parent | a03e77b8670faa133c76f4d7b29bf362246d20b5 (diff) | |
parent | fc386675692bfaa1d2eb7a96c2bc92b3ad471327 (diff) | |
download | scala-816bcdf382ea0469f6c5eadcff44901921ba6075.tar.gz scala-816bcdf382ea0469f6c5eadcff44901921ba6075.tar.bz2 scala-816bcdf382ea0469f6c5eadcff44901921ba6075.zip |
Merge pull request #1871 from adriaanm/merge-2.10.x
Merge 2.10.x
Diffstat (limited to 'test/files/run/idempotency-case-classes.check')
-rw-r--r-- | test/files/run/idempotency-case-classes.check | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/files/run/idempotency-case-classes.check b/test/files/run/idempotency-case-classes.check index d2fb8169cb..700af3b81b 100644 --- a/test/files/run/idempotency-case-classes.check +++ b/test/files/run/idempotency-case-classes.check @@ -29,7 +29,10 @@ C(2,3) Statics.this.finalizeHash(acc, 2) }; override <synthetic> def toString(): String = ScalaRunTime.this._toString(C.this); - override <synthetic> def equals(x$1: Any): Boolean = C.this.eq(x$1.asInstanceOf[Object]).||(x$1.isInstanceOf[C].&&({ + override <synthetic> def equals(x$1: Any): Boolean = C.this.eq(x$1.asInstanceOf[Object]).||(x$1 match { + case (_: C) => true + case _ => false +}.&&({ <synthetic> val C$1: C = x$1.asInstanceOf[C]; C.this.x.==(C$1.x).&&(C.this.y.==(C$1.y)).&&(C$1.canEqual(C.this)) })) |