diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-06 11:37:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:49:38 -0800 |
| commit | 7539c4ee51c25a684399cd5400bf0285e6508fe2 (patch) | |
| tree | 94a9eb9b9519417d1924711f56638a4be02f4a2b /test/files/jvm/serialization.check | |
| parent | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (diff) | |
| parent | 93c2d93f4e7aaffaac92bdf14714a6c3871718c9 (diff) | |
| download | scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.gz scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.bz2 scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.zip | |
Merge branch 'master' into topic/inline
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
test/files/run/programmatic-main.check
Diffstat (limited to 'test/files/jvm/serialization.check')
| -rw-r--r-- | test/files/jvm/serialization.check | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index f58f763a76..67b77639a2 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -192,6 +192,10 @@ x = TreeSet(1, 2, 3) y = TreeSet(1, 2, 3) x equals y: true, y equals x: true +x = Ctrie(1 -> one, 2 -> two, 3 -> three) +y = Ctrie(1 -> one, 2 -> two, 3 -> three) +x equals y: true, y equals x: true + x = xml:src="hello" y = xml:src="hello" x equals y: true, y equals x: true @@ -283,6 +287,10 @@ x = ParHashMap(1 -> 2, 2 -> 4) y = ParHashMap(1 -> 2, 2 -> 4) x equals y: true, y equals x: true +x = ParCtrie(1 -> 2, 2 -> 4) +y = ParCtrie(1 -> 2, 2 -> 4) +x equals y: true, y equals x: true + x = ParHashSet(1, 2, 3) y = ParHashSet(1, 2, 3) x equals y: true, y equals x: true |