Skip to content

Update scala-library to 2.13.15 #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Philippus merged 4 commits into scala:main from scala-steward:update/scala-library-2.13.15

Oct 18, 2024

Merged

Update scala-library to 2.13.15 #562

Changes from all commits

Commits

Show all changes

Select commit Hold shift + click to select a range

Update scala-library to 2.13.15

scala-steward Sep 26, 2024

Merge branch 'main' into update/scala-library-2.13.15

Philippus Sep 29, 2024

Silence infer any

Philippus Sep 29, 2024

Silence specific category

Philippus Sep 29, 2024

File filter

Filter by extension

Conversations

Jump to

Jump to file

Failed to load files.

Loading

Diff view

Diff view

2 changes: 1 addition & 1 deletion build.sbt

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004)
		val commonSettings = Seq(
		versionScheme := Some("early-semver"),
		versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
	crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.4"),
	crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4"),
		scalaVersion := crossScalaVersions.value.head,
		)

Expand Down

2 changes: 2 additions & 0 deletions shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@ package lexical

		import token._
		import input.CharArrayReader.EofCh
	import scala.annotation.nowarn
		import scala.collection.mutable

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

		// see `whitespace in `Scanners`
	@nowarn("cat=lint-infer-any")
		def whitespace: Parser[Any] = rep[Any](
		whitespaceChar
		\| '/' ~ '*' ~ comment
Expand Down

2 changes: 1 addition & 1 deletion shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -222,7 +222,7 @@ private object grammars3 extends StandardTokenParsers with PackratParsers {
		\| success(Nil)
		)

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

Expand Down