Skip to content

Commit 40b28c4

Browse files
committed
Merge pull request scala#4557 from adriaanm/mcpasterton-2.10
Clean implementation of sorts for scala.util.Sorting.
2 parents d4deb27 + 7d1b129 commit 40b28c4

File tree

3 files changed

+356
-477
lines changed

3 files changed

+356
-477
lines changed

bincompat-forward.whitelist.conf

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,58 @@ filter {
195195
{
196196
matchName="scala.xml.pull.ExceptionEvent$"
197197
problemName=MissingClassProblem
198+
},
199+
{
200+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5"
201+
problemName=MissingMethodProblem
202+
},
203+
{
204+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mBc$sp"
205+
problemName=MissingMethodProblem
206+
},
207+
{
208+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mFc$sp"
209+
problemName=MissingMethodProblem
210+
},
211+
{
212+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mJc$sp"
213+
problemName=MissingMethodProblem
214+
},
215+
{
216+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort"
217+
problemName=MissingMethodProblem
218+
},
219+
{
220+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mCc$sp"
221+
problemName=MissingMethodProblem
222+
},
223+
{
224+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mSc$sp"
225+
problemName=MissingMethodProblem
226+
},
227+
{
228+
matchName="scala.util.Sorting.scala$util$Sorting$$insertionSort"
229+
problemName=MissingMethodProblem
230+
},
231+
{
232+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mZc$sp"
233+
problemName=MissingMethodProblem
234+
},
235+
{
236+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mDc$sp"
237+
problemName=MissingMethodProblem
238+
},
239+
{
240+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSort$mIc$sp"
241+
problemName=MissingMethodProblem
242+
},
243+
{
244+
matchName="scala.util.Sorting.scala$util$Sorting$$mergeSorted"
245+
problemName=MissingMethodProblem
246+
},
247+
{
248+
matchName="scala.util.Sorting.scala$util$Sorting$$booleanSort"
249+
problemName=MissingMethodProblem
198250
}
199251
]
200252
}

0 commit comments

Comments
 (0)