Skip to content

Commit

Permalink
Merge pull request scala#9253 from dotty-staging/upgrade/scala-2.13.3
Browse files Browse the repository at this point in the history
Upgrade scala-library to 2.13.3
  • Loading branch information
anatoliykmetyuk authored Jun 29, 2020
2 parents 4d512f0 + 653e112 commit 8c5a58f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion community-build/community-projects/sourcecode
4 changes: 2 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions tests/run/serialization-new.check
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/run/t4601.check
Original file line number Diff line number Diff line change
@@ -1 +1 @@
'blubber
Symbol(blubber)
2 changes: 1 addition & 1 deletion tests/run/t6633.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/run/t6634.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8c5a58f

Please sign in to comment.