From 653e1127623c776e7b93dfc9ade7592fed21dba6 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 27 Jun 2020 14:45:28 +0200 Subject: [PATCH] Upgrade scala-library to 2.13.3 --- community-build/community-projects/sourcecode | 2 +- project/Build.scala | 4 ++-- tests/run/serialization-new.check | 8 ++++---- tests/run/t4601.check | 2 +- tests/run/t6633.scala | 2 +- tests/run/t6634.scala | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode index 3e8b8b95688f..15eaf0144d9c 160000 --- a/community-build/community-projects/sourcecode +++ b/community-build/community-projects/sourcecode @@ -1 +1 @@ -Subproject commit 3e8b8b95688fad9b67cada41118156d1c5641573 +Subproject commit 15eaf0144d9cc4c45b2a44735a6366396c5181c7 diff --git a/project/Build.scala b/project/Build.scala index 48c1a99a64ff..b78b383ab5cb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -81,8 +81,8 @@ object Build { * scala-library. */ def stdlibVersion(implicit mode: Mode): String = mode match { - case NonBootstrapped => "2.13.2" - case Bootstrapped => "2.13.2" + case NonBootstrapped => "2.13.3" + case Bootstrapped => "2.13.3" } val dottyOrganization = "ch.epfl.lamp" diff --git a/tests/run/serialization-new.check b/tests/run/serialization-new.check index 697b2c3bf4d8..93dd1dc4fcce 100644 --- a/tests/run/serialization-new.check +++ b/tests/run/serialization-new.check @@ -54,8 +54,8 @@ _o2 = Some(1) o2 eq _o2: false, _o2 eq o2: false o2 equals _o2: true, _o2 equals o2: true -s1 = 'hello -_s1 = 'hello +s1 = Symbol(hello) +_s1 = Symbol(hello) s1 eq _s1: true, _s1 eq s1: true s1 equals _s1: true, _s1 equals s1: true @@ -124,8 +124,8 @@ x = TreeSet(0, 2) y = TreeSet(0, 2) x equals y: true, y equals x: true -x = Vector('a, 'b, 'c) -y = Vector('a, 'b, 'c) +x = Vector(Symbol(a), Symbol(b), Symbol(c)) +y = Vector(Symbol(a), Symbol(b), Symbol(c)) x equals y: true, y equals x: true x = ArrayBuffer(one, two) diff --git a/tests/run/t4601.check b/tests/run/t4601.check index 83b0b0b0ff7a..0d3a5fb9e924 100644 --- a/tests/run/t4601.check +++ b/tests/run/t4601.check @@ -1 +1 @@ -'blubber +Symbol(blubber) diff --git a/tests/run/t6633.scala b/tests/run/t6633.scala index 51ceeef7faa5..f848924abe8e 100644 --- a/tests/run/t6633.scala +++ b/tests/run/t6633.scala @@ -20,7 +20,7 @@ object Test extends App { } val replStr = scala.runtime.ScalaRunTime.replStringOf(lb1, 100) - if (replStr == "ListBuffer('a, 'b, 'c, 'd, 'e)\n") + if (replStr == "ListBuffer(Symbol(a), Symbol(b), Symbol(c), Symbol(d), Symbol(e))\n") println("replStringOf OK") else println("replStringOf FAILED: " + replStr) diff --git a/tests/run/t6634.scala b/tests/run/t6634.scala index 38882e9e1852..d972b7454e91 100644 --- a/tests/run/t6634.scala +++ b/tests/run/t6634.scala @@ -67,7 +67,7 @@ object Test extends App { // buffer should neither be changed nor corrupted after calling remove with invalid arguments def checkNotCorrupted( lb: ListBuffer[Symbol], - expectedString: String = "ListBuffer('a, 'b, 'c, 'd, 'e)", + expectedString: String = "ListBuffer(Symbol(a), Symbol(b), Symbol(c), Symbol(d), Symbol(e))", expectedLength: Int = 5) = { println("Checking ...") val replStr = scala.runtime.ScalaRunTime.replStringOf(lb, 100)