diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-11-11 13:52:25 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 13:52:25 +1000 |
| commit | 411cf28f4506481b261cfc6802a10142a9676bee (patch) | |
| tree | bc7b633f3a7114ef156209585cc3a4094bd73505 /test/files | |
| parent | fde19d56290fb70da577a5b906786f55424de3ef (diff) | |
| parent | b7da41d876e2f0619aab9882ef2c5f7333d9d283 (diff) | |
| download | scala-411cf28f4506481b261cfc6802a10142a9676bee.tar.gz scala-411cf28f4506481b261cfc6802a10142a9676bee.tar.bz2 scala-411cf28f4506481b261cfc6802a10142a9676bee.zip | |
Merge pull request #5335 from rumoku/SI-9888
SI-9888. Prevent OOM on ParRange. Improve toString.
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/jvm/serialization-new.check | 8 | ||||
| -rw-r--r-- | test/files/jvm/serialization.check | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/files/jvm/serialization-new.check b/test/files/jvm/serialization-new.check index 90da8a085d..da41ba4bdd 100644 --- a/test/files/jvm/serialization-new.check +++ b/test/files/jvm/serialization-new.check @@ -268,12 +268,12 @@ x = ParHashSet(1, 2, 3) y = ParHashSet(1, 2, 3) x equals y: true, y equals x: true -x = ParRange(0, 1, 2, 3, 4) -y = ParRange(0, 1, 2, 3, 4) +x = ParRange 0 to 4 +y = ParRange 0 to 4 x equals y: true, y equals x: true -x = ParRange(0, 1, 2, 3) -y = ParRange(0, 1, 2, 3) +x = ParRange 0 until 4 +y = ParRange 0 until 4 x equals y: true, y equals x: true x = ParMap(5 -> 1, 10 -> 2) diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 964c68e528..38017d829f 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -268,12 +268,12 @@ x = ParHashSet(1, 2, 3) y = ParHashSet(1, 2, 3) x equals y: true, y equals x: true -x = ParRange(0, 1, 2, 3, 4) -y = ParRange(0, 1, 2, 3, 4) +x = ParRange 0 to 4 +y = ParRange 0 to 4 x equals y: true, y equals x: true -x = ParRange(0, 1, 2, 3) -y = ParRange(0, 1, 2, 3) +x = ParRange 0 until 4 +y = ParRange 0 until 4 x equals y: true, y equals x: true x = ParMap(5 -> 1, 10 -> 2) |