Skip to content

Commit 6bbf7a8

Browse files
authored
Merge pull request #562 from scala-steward/update/scala-library-2.13.15
Update scala-library to 2.13.15
2 parents f84e2d0 + 9b5cc10 commit 6bbf7a8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004)
44
val commonSettings = Seq(
55
versionScheme := Some("early-semver"),
66
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
7-
crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.4"),
7+
crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4"),
88
scalaVersion := crossScalaVersions.value.head,
99
)
1010

shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package lexical
1717

1818
import token._
1919
import input.CharArrayReader.EofCh
20+
import scala.annotation.nowarn
2021
import scala.collection.mutable
2122

2223
/** This component provides a standard lexical parser for a simple,
@@ -54,6 +55,7 @@ class StdLexical extends Lexical with StdTokens {
5455
}
5556

5657
// see `whitespace in `Scanners`
58+
@nowarn("cat=lint-infer-any")
5759
def whitespace: Parser[Any] = rep[Any](
5860
whitespaceChar
5961
| '/' ~ '*' ~ comment

shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private object grammars3 extends StandardTokenParsers with PackratParsers {
222222
| success(Nil)
223223
)
224224

225-
@annotation.nowarn // Some(xs) in pattern isn't exhaustive
225+
@annotation.nowarn("cat=other-match-analysis")
226226
def repMany1[T](p: => Parser[T], q: => Parser[T]): Parser[List[T]] =
227227
p~opt(repMany(p,q))~q ^^ {case x~Some(xs)~y => x::xs:::(y::Nil)}
228228

0 commit comments

Comments
 (0)