Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 43a56fb

Browse files
committed
Merge pull request scala#4534 from Ichoran/sorting-reimpl
Clean implementation of sorts for scala.util.Sorting.
2 parents 6b09c66 + 9aae16a commit 43a56fb

File tree

3 files changed

+357
-477
lines changed

3 files changed

+357
-477
lines changed

bincompat-forward.whitelist.conf

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,59 @@ filter {
319319
{
320320
matchName="scala.util.Random.scala$util$Random$$nextAlphaNum$1"
321321
problemName=MissingMethodProblem
322+
},
323+
// Nominally private but in practice JVM-visible methods for reworked scala.util.Sorting
324+
{
325+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5"
326+
problemName=MissingMethodProblem
327+
},
328+
{
329+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mBc$sp"
330+
problemName=MissingMethodProblem
331+
},
332+
{
333+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mFc$sp"
334+
problemName=MissingMethodProblem
335+
},
336+
{
337+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mJc$sp"
338+
problemName=MissingMethodProblem
339+
},
340+
{
341+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort"
342+
problemName=MissingMethodProblem
343+
},
344+
{
345+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mCc$sp"
346+
problemName=MissingMethodProblem
347+
},
348+
{
349+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mSc$sp"
350+
problemName=MissingMethodProblem
351+
},
352+
{
353+
matchName="scala.util.Sorting.scala$util$Sorting$$insertionSort"
354+
problemName=MissingMethodProblem
355+
},
356+
{
357+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mZc$sp"
358+
problemName=MissingMethodProblem
359+
},
360+
{
361+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mDc$sp"
362+
problemName=MissingMethodProblem
363+
},
364+
{
365+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mIc$sp"
366+
problemName=MissingMethodProblem
367+
},
368+
{
369+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSorted"
370+
problemName=MissingMethodProblem
371+
},
372+
{
373+
matchName="scala.util.Sorting.scala$util$Sorting$$booleanSort"
374+
problemName=MissingMethodProblem
322375
}
323376
]
324377
}

0 commit comments

Comments
 (0)