Update dotty 0.21.0-RC1

Author: ashawley

.circleci/config.yml

@@ -89,9 +89,9 @@ workflows:
           java_version: jdk8
           scala_version: 2.13.1
       - scala_job:
-          name: dotty-0.18
+          name: dotty-0.21
           java_version: jdk8
-          scala_version: 0.20.0-RC1
+          scala_version: 0.21.0-RC1
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -103,7 +103,7 @@ workflows:
       - scala_job:
           name: jdk11_dotty
           java_version: jdk11
-          scala_version: 0.20.0-RC1
+          scala_version: 0.21.0-RC1
       - scala_job:
           name: jdk13_2.12
           java_version: jdk13
@@ -115,7 +115,7 @@ workflows:
       - scala_job:
           name: jdk13_dotty
           java_version: jdk13
-          scala_version: 0.20.0-RC1
+          scala_version: 0.21.0-RC1
       - scala_job:
           name: jdk14_2.12
           java_version: jdk14
@@ -127,7 +127,7 @@ workflows:
       - scala_job:
           name: jdk14_dotty
           java_version: jdk14
-          scala_version: 0.20.0-RC1
+          scala_version: 0.21.0-RC1
       - scalajs_job:
           name: sjs0.6_2.12
           scala_version: 2.12.10

.travis.yml

@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 0.20.0-RC1
+  - 0.21.0-RC1
   - 2.12.10
   - 2.13.1
 
@@ -18,9 +18,9 @@ env:
 
 matrix:
   exclude:
-    - scala: 0.20.0-RC1
+    - scala: 0.21.0-RC1
       env: SCALAJS_VERSION=0.6.31    ADOPTOPENJDK=8
-    - scala: 0.20.0-RC1
+    - scala: 0.21.0-RC1
       env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
 
 install:

shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala

@@ -291,10 +291,10 @@ class XIncludeFilter extends XMLFilterImpl {
       val reader = new InputStreamReader(in, encoding)
       val c = new Array[Char](1024)
       var charsRead: Int = 0 // bogus init value
-      do {
+      while ({ {
         charsRead = reader.read(c, 0, 1024)
         if (charsRead > 0) this.characters(c, 0, charsRead)
-      } while (charsRead != -1)
+      } ; charsRead != -1}) ()
     } catch {
       case e: UnsupportedEncodingException =>
         throw new SAXException("Unsupported encoding: "

shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala

@@ -115,8 +115,8 @@ private[scala] trait MarkupParserCommon extends TokenTests {
 
     val buf = new StringBuilder
 
-    do buf append ch_returning_nextch
-    while (isNameChar(ch))
+    while ({ buf append ch_returning_nextch
+    ; isNameChar(ch)}) ()
 
     if (buf.last == ':') {
       reportSyntaxError("name cannot end in ':'")