[compiler] misc scala 2.13 deprecation fixes #15137
Open
+122
−206
Conversation
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
patrick-schultz
force-pushed
the
ps/push-utzzvzyqrtsk
branch
2 times, most recently
from
daf99a1 to
22a2e36
Compare
patrick-schultz
force-pushed
the
ps/push-utzzvzyqrtsk
branch
from
22a2e36 to
d9e6787
Compare
ehigham
approved these changes
Oct 30, 2025
Comment on lines
-427
to
-501
| /** An abstraction for building an {@code Array} of known size. Guarantees a left-to-right | ||
| * traversal | ||
| * | ||
| * @param xs | ||
| * the thing to iterate over | ||
| * @param size | ||
| * the size of array to allocate | ||
| * @param key | ||
| * given the source value and its source index, yield the target index | ||
| * @param combine | ||
| * given the target value, the target index, the source value, and the source index, compute | ||
| * the new target value | ||
| * @tparam A | ||
| * @tparam B | ||
| */ | ||
| def coalesce[A, B: ClassTag]( | ||
| xs: GenTraversableOnce[A] | ||
| )( | ||
| size: Int, | ||
| key: (A, Int) => Int, | ||
| z: B, | ||
| )( | ||
| combine: (B, A) => B | ||
| ): Array[B] = { | ||
| val a = Array.fill(size)(z) | ||
|
|
||
| for ((x, idx) <- xs.toIterator.zipWithIndex) { | ||
| val k = key(x, idx) | ||
| a(k) = combine(a(k), x) | ||
| } | ||
|
|
||
| a | ||
| } | ||
|
|
||
| def mapSameElements[K, V](l: Map[K, V], r: Map[K, V], valueEq: (V, V) => Boolean): Boolean = { | ||
| def entryMismatchMessage(failures: TraversableOnce[(K, V, V)]): String = { | ||
| require(failures.nonEmpty) | ||
| val newline = System.lineSeparator() | ||
| val sb = new StringBuilder | ||
| sb ++= "The maps do not have the same entries:" + newline | ||
| for (failure <- failures) | ||
| sb ++= s" At key ${failure._1}, the left map has ${failure._2} and the right map has ${failure._3}" + newline | ||
| sb ++= s" The left map is: $l" + newline | ||
| sb ++= s" The right map is: $r" + newline | ||
| sb.result() | ||
| } | ||
|
|
||
| if (l.keySet != r.keySet) { | ||
| println( | ||
| s"""The maps do not have the same keys. | ||
| | These keys are unique to the left-hand map: ${l.keySet -- r.keySet} | ||
| | These keys are unique to the right-hand map: ${r.keySet -- l.keySet} | ||
| | The left map is: $l | ||
| | The right map is: $r | ||
| """.stripMargin | ||
| ) | ||
| false | ||
| } else { | ||
| val fs = Array.newBuilder[(K, V, V)] | ||
| for ((k, lv) <- l) { | ||
| val rv = r(k) | ||
| if (!valueEq(lv, rv)) | ||
| fs += ((k, lv, rv)) | ||
| } | ||
| val failures = fs.result() | ||
|
|
||
| if (!failures.isEmpty) { | ||
| println(entryMismatchMessage(failures)) | ||
| false | ||
| } else { | ||
| true | ||
| } | ||
| } | ||
| } | ||
|
|
chrisvittal
approved these changes
Nov 4, 2025
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.
Change Description
The changes are summarized by the removed warning silencers in
build.mill.Security Assessment