Skip to content

Commit f99262d

Browse files
authored
Backport "Scala 2.13.10 (was 2.13.8)" (#16203)
Backports #16074
2 parents 558e21d + 77b36c1 commit f99262d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed
Submodule stdLib213 updated 613 files

project/Build.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ object Build {
120120
* scala-library.
121121
*/
122122
def stdlibVersion(implicit mode: Mode): String = mode match {
123-
case NonBootstrapped => "2.13.8"
124-
case Bootstrapped => "2.13.8"
123+
case NonBootstrapped => "2.13.10"
124+
case Bootstrapped => "2.13.10"
125125
}
126126

127127
val dottyOrganization = "org.scala-lang"

scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Scaladoc2ExternalLocationProviderIntegrationTest extends ExternalLocationP
3333
"https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html",
3434
"https://www.scala-lang.org/api/current/scala/Predef$.html#String",
3535
"https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html",
36-
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder",
36+
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):b.type",
3737
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String",
3838
"https://external.stubs/api/tests/externalStubs/$div$bslash$.html",
3939
"https://external.stubs/api/tests/externalStubs/$bslash$div$.html"
@@ -67,7 +67,7 @@ class Scaladoc2LegacyExternalLocationProviderIntegrationTest extends LegacyExter
6767
"https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html",
6868
"https://www.scala-lang.org/api/current/scala/Predef$.html#String",
6969
"https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html",
70-
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder",
70+
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):b.type",
7171
"https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String"
7272
)
7373
)

tests/neg/i11982.check

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-- Error: tests/neg/i11982.scala:22:38 ---------------------------------------------------------------------------------
22
22 | val p1: ("msg", 42) = unpair[Tshape] // error: no singleton value for Any
33
| ^
4-
| No singleton value available for Any.
4+
|No singleton value available for Any; eligible singleton types for `ValueOf` synthesis include literals and stable paths.

0 commit comments

Comments
 (0)