Skip to content

Commit 012c552

Browse files
authored
Merge pull request scala#5843 from lrytz/merge-2.12-to-2.13-apr-11
Merge 2.12 to 2.13 [ci: last-only]
2 parents 87c8eb7 + 002c078 commit 012c552

File tree

138 files changed

+2384
-1511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+2384
-1511
lines changed

bincompat-backward.whitelist.conf

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -238,47 +238,6 @@ filter {
238238
{
239239
matchName="scala.concurrent.impl.Promise.toString"
240240
problemName=MissingMethodProblem
241-
},
242-
// https://github.com/scala/scala/pull/5652
243-
{
244-
matchName="scala.collection.mutable.ArrayOps#ofChar.slice"
245-
problemName=FinalMethodProblem
246-
},
247-
{
248-
matchName="scala.collection.mutable.ArrayOps#ofShort.slice"
249-
problemName=FinalMethodProblem
250-
},
251-
{
252-
matchName="scala.collection.mutable.ArrayOps#ofUnit.slice"
253-
problemName=FinalMethodProblem
254-
},
255-
{
256-
matchName="scala.collection.mutable.ArrayOps#ofInt.slice"
257-
problemName=FinalMethodProblem
258-
},
259-
{
260-
matchName="scala.collection.mutable.ArrayOps#ofBoolean.slice"
261-
problemName=FinalMethodProblem
262-
},
263-
{
264-
matchName="scala.collection.mutable.ArrayOps#ofDouble.slice"
265-
problemName=FinalMethodProblem
266-
},
267-
{
268-
matchName="scala.collection.mutable.ArrayOps#ofRef.slice"
269-
problemName=FinalMethodProblem
270-
},
271-
{
272-
matchName="scala.collection.mutable.ArrayOps#ofByte.slice"
273-
problemName=FinalMethodProblem
274-
},
275-
{
276-
matchName="scala.collection.mutable.ArrayOps#ofLong.slice"
277-
problemName=FinalMethodProblem
278-
},
279-
{
280-
matchName="scala.collection.mutable.ArrayOps#ofFloat.slice"
281-
problemName=FinalMethodProblem
282241
}
283242
]
284243
}

0 commit comments

Comments
 (0)