Merge 2.12 to 2.13 [ci: last-only]#10332
Merged
SethTisue merged 30 commits intoscala:2.13.xfrom Feb 28, 2023
Merged
Conversation
…on-module-scala-2.13.5
[backport] flag eta-expanding methods without parameter lists under source:2.13
[backport] -md md5 when decrypting credentials
Under `-Xsource:2.13`, warn when an inherited member takes precedence over an outer definition.
In type patterns `c match { case x: T }`, the translation would assign
the GLB of `c`'s type and `T` to the varaible `x`.
This seems to trace back to the first version of the "virtual pattern
matcher". I could not find a similar use of `glb` in that revision
of the codebase. So I'm not sure if it was a new addition, or picked
up from the previous implementation.
https://github.com/scala/scala/blob/8a9fd64129926eea35f7dca181242855f14e153f/src/compiler/scala/tools/nsc/typechecker/PatMatVirtualiser.scala#L438-L440
In the test case, the GLB collapsed to `Null` because its
computation failed (combination of f-bounds, existentials, skolems that
I don't follow), see `throw GlbFailure`. This is how it's been for 14
years (b894f80). This resulted in a cast to `Null$` failing at
runtime.
I assume GLB is fixed in Scala 3, as this core of the type system has
a new implementation. But the test case as such doesn't compile in
Scala 3 due to the non-wildcard existential.
…mh-0.4.4 Update sbt-jmh to 0.4.4 in 2.12.x
at e.g. https://github.com/scala/scala/actions/runs/4130256541 GitHub is telling us: > Node.js 12 actions are deprecated. Please update the following > actions to use Node.js 16: actions/checkout@v2. For more information > see: > https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ I eyeballed https://github.com/actions/checkout/releases but didn't see any compatibility concerns
…on-module-scala-2.14.2 Update jackson-module-scala to 2.14.2 in 2.12.x
Fix spec build
This is a follow-up for PR 10297 that fixes false positive ambiguity warnings.
hamzaremmal
pushed a commit
to hamzaremmal/scala3
that referenced
this pull request
May 2, 2025
hamzaremmal
pushed a commit
to scala/scala3
that referenced
this pull request
May 7, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
all routine stuff, no user-visible changes
PICK 76c7583 - PR 10330 from SethTisue/mklibnatives-arm
PICK ad0f95e - PR 10304 from SethTisue/update-github-actions
PICK fedccea - PR 10301 from scala-steward/update/2.12.x/sbt-jmh-0.4.4
SKIP e66a461 - PR 10315 from som-snytt/issue/11547-times
SKIP 2b9b862 - PR 10314 from lrytz/t11921-backport-fixes
SKIP d097f88 - PR 10312 from lrytz/spec-webrick
SKIP 8bbbd54 - PR 10297 from lrytz/t11921-backport
SKIP de8fa1e - PR 10298 from lrytz/t12702-backport
SKIP ece23d1 - PR 10300 from scala-steward/update/2.12.x/jackson-module-scala-2.14.2
SKIP 7a7c2bd - PR 10286 from lrytz/spec-travis-fix
SKIP 46b4216 - PR 10283 from lrytz/nullary-eta-backport
SKIP b2191b7 - PR 10275 from scala-steward/update/2.12.x/jackson-module-scala-2.13.5