Skip to content

Synchronize standard library sources with Scala 2.13.18 #24788

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
WojciechMazur merged 8 commits into from
Dec 22, 2025
Merged

Synchronize standard library sources with Scala 2.13.18 #24788

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b16dd7
Re-introduce null checks to ScalaRunTime.wrapXArray
lrytz Oct 27, 2025
bea3196
IterableOnce: Documentation update in IterableOnce `cmp` -> `ord`
ev-ev Oct 31, 2025
51aa5b9
fix Buffer.filterInPlace scaladoc
xuwei-k Nov 5, 2025
ffbe998
Add `@uncheckedOverride` annotation for definitions that may override
lrytz Nov 3, 2025
4a16c59
Add script to sychronize stdlib sources
WojciechMazur Dec 21, 2025
29eb965
Use `mapNull` to implement ScalaRunTime array wrap functions
WojciechMazur Dec 21, 2025
675e656
Add regression test for #24204 fixed by changes to ScalaRunTime
WojciechMazur Dec 21, 2025
9b37e89
Adjust MiMa filters
WojciechMazur Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
IterableOnce: Documentation update in IterableOnce cmp -> ord 
Some functions appear to be using an outdated name for the ordering function parameter (formerly cmp, now ord) in the documentation. Those are changed to the current name (ord).

Signed-off-by: Evgeny Vereshchagin <[email protected]>

Upstream: scala/scala@80589cc
  • Loading branch information
@ev-ev @WojciechMazur
ev-ev authored and WojciechMazur committed Dec 21, 2025
commit bea3196854914e45b7a4541a3eca1159d57696ea
16 changes: 8 additions & 8 deletions library/src/scala/collection/IterableOnce.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,12 +1174,12 @@ transparent trait IterableOnceOps[+A, +CC[_], +C] extends Any { this: IterableOn
*
* $willNotTerminateInf
*
* @param cmp An ordering to be used for comparing elements.
* @param ord An ordering to be used for comparing elements.
* @tparam B The result type of the function `f`.
* @param f The measuring function.
* @throws UnsupportedOperationException if this $coll is empty.
* @return the first element of this $coll with the largest value measured by function `f`
* with respect to the ordering `cmp`.
* with respect to the ordering `ord`.
*/
def maxBy[B](f: A -> B)(implicit ord: Ordering[B]): A =
knownSize match {
Expand Down Expand Up @@ -1214,11 +1214,11 @@ transparent trait IterableOnceOps[+A, +CC[_], +C] extends Any { this: IterableOn
*
* $willNotTerminateInf
*
* @param cmp An ordering to be used for comparing elements.
* @param ord An ordering to be used for comparing elements.
* @tparam B The result type of the function `f`.
* @param f The measuring function.
* @return an option value containing the first element of this $coll with the
* largest value measured by function `f` with respect to the ordering `cmp`.
* largest value measured by function `f` with respect to the ordering `ord`.
*/
def maxByOption[B](f: A -> B)(implicit ord: Ordering[B]): Option[A] =
knownSize match {
Expand All @@ -1230,12 +1230,12 @@ transparent trait IterableOnceOps[+A, +CC[_], +C] extends Any { this: IterableOn
*
* $willNotTerminateInf
*
* @param cmp An ordering to be used for comparing elements.
* @param ord An ordering to be used for comparing elements.
* @tparam B The result type of the function `f`.
* @param f The measuring function.
* @throws UnsupportedOperationException if this $coll is empty.
* @return the first element of this $coll with the smallest value measured by function `f`
* with respect to the ordering `cmp`.
* with respect to the ordering `ord`.
*/
def minBy[B](f: A -> B)(implicit ord: Ordering[B]): A =
knownSize match {
Expand All @@ -1247,12 +1247,12 @@ transparent trait IterableOnceOps[+A, +CC[_], +C] extends Any { this: IterableOn
*
* $willNotTerminateInf
*
* @param cmp An ordering to be used for comparing elements.
* @param ord An ordering to be used for comparing elements.
* @tparam B The result type of the function `f`.
* @param f The measuring function.
* @return an option value containing the first element of this $coll
* with the smallest value measured by function `f`
* with respect to the ordering `cmp`.
* with respect to the ordering `ord`.
*/
def minByOption[B](f: A -> B)(implicit ord: Ordering[B]): Option[A] =
knownSize match {
Expand Down