Skip to content

Commit 1ef37f0

Browse files
adriaanmadriaanm
authored
Merge pull request scala#5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 2.11.x
2 parents 2261f3e + 0d88720 commit 1ef37f0

File tree

19 files changed

+78
-653
lines changed

19 files changed

+78
-653
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
}

‎bincompat-forward.whitelist.conf

Lines changed: 0 additions & 345 deletions
Original file line numberDiff line numberDiff line change
@@ -87,351 +87,6 @@ filter {
8787
matchName="scala.reflect.api.SerializedTypeTag.serialVersionUID"
8888
problemName=MissingFieldProblem
8989
},
90-
{
91-
matchName="scala.collection.mutable.ArrayOps$ofChar"
92-
problemName=MissingTypesProblem
93-
},
94-
{
95-
matchName="scala.collection.mutable.ArrayOps#ofChar.sliceImpl"
96-
problemName=DirectMissingMethodProblem
97-
},
98-
{
99-
matchName="scala.collection.mutable.ArrayOps#ofChar.emptyImpl"
100-
problemName=DirectMissingMethodProblem
101-
},
102-
{
103-
matchName="scala.collection.mutable.ArrayOps$ofShort"
104-
problemName=MissingTypesProblem
105-
},
106-
{
107-
matchName="scala.collection.mutable.ArrayOps#ofShort.sliceImpl"
108-
problemName=DirectMissingMethodProblem
109-
},
110-
{
111-
matchName="scala.collection.mutable.ArrayOps#ofShort.emptyImpl"
112-
problemName=DirectMissingMethodProblem
113-
},
114-
{
115-
matchName="scala.collection.mutable.WrappedArray#ofByte.sliceImpl"
116-
problemName=DirectMissingMethodProblem
117-
},
118-
{
119-
matchName="scala.collection.mutable.WrappedArray#ofByte.emptyImpl"
120-
problemName=DirectMissingMethodProblem
121-
},
122-
{
123-
matchName="scala.collection.mutable.WrappedArray#ofBoolean.sliceImpl"
124-
problemName=DirectMissingMethodProblem
125-
},
126-
{
127-
matchName="scala.collection.mutable.WrappedArray#ofBoolean.emptyImpl"
128-
problemName=DirectMissingMethodProblem
129-
},
130-
{
131-
matchName="scala.collection.mutable.WrappedArray#ofChar.sliceImpl"
132-
problemName=DirectMissingMethodProblem
133-
},
134-
{
135-
matchName="scala.collection.mutable.WrappedArray#ofChar.emptyImpl"
136-
problemName=DirectMissingMethodProblem
137-
},
138-
{
139-
matchName="scala.collection.mutable.WrappedArray#ofDouble.sliceImpl"
140-
problemName=DirectMissingMethodProblem
141-
},
142-
{
143-
matchName="scala.collection.mutable.WrappedArray#ofDouble.emptyImpl"
144-
problemName=DirectMissingMethodProblem
145-
},
146-
{
147-
matchName="scala.collection.mutable.ArrayOps$ofUnit"
148-
problemName=MissingTypesProblem
149-
},
150-
{
151-
matchName="scala.collection.mutable.ArrayOps#ofUnit.sliceImpl"
152-
problemName=DirectMissingMethodProblem
153-
},
154-
{
155-
matchName="scala.collection.mutable.ArrayOps#ofUnit.emptyImpl"
156-
problemName=DirectMissingMethodProblem
157-
},
158-
{
159-
matchName="scala.collection.mutable.ArrayOps#ofInt.sliceImpl$extension"
160-
problemName=DirectMissingMethodProblem
161-
},
162-
{
163-
matchName="scala.collection.mutable.ArrayOps#ofInt.emptyImpl$extension"
164-
problemName=DirectMissingMethodProblem
165-
},
166-
{
167-
matchName="scala.collection.mutable.ArrayOps$ofInt"
168-
problemName=MissingTypesProblem
169-
},
170-
{
171-
matchName="scala.collection.mutable.ArrayOps#ofInt.sliceImpl"
172-
problemName=DirectMissingMethodProblem
173-
},
174-
{
175-
matchName="scala.collection.mutable.ArrayOps#ofInt.emptyImpl"
176-
problemName=DirectMissingMethodProblem
177-
},
178-
{
179-
matchName="scala.collection.mutable.ArrayOps#ofRef.sliceImpl$extension"
180-
problemName=DirectMissingMethodProblem
181-
},
182-
{
183-
matchName="scala.collection.mutable.ArrayOps#ofRef.emptyImpl$extension"
184-
problemName=DirectMissingMethodProblem
185-
},
186-
{
187-
matchName="scala.collection.mutable.ArrayOps#ofChar.sliceImpl$extension"
188-
problemName=DirectMissingMethodProblem
189-
},
190-
{
191-
matchName="scala.collection.mutable.ArrayOps#ofChar.emptyImpl$extension"
192-
problemName=DirectMissingMethodProblem
193-
},
194-
{
195-
matchName="scala.collection.mutable.ArrayOps#ofUnit.sliceImpl$extension"
196-
problemName=DirectMissingMethodProblem
197-
},
198-
{
199-
matchName="scala.collection.mutable.ArrayOps#ofUnit.emptyImpl$extension"
200-
problemName=DirectMissingMethodProblem
201-
},
202-
{
203-
matchName="scala.collection.mutable.ArrayOps$ofBoolean"
204-
problemName=MissingTypesProblem
205-
},
206-
{
207-
matchName="scala.collection.mutable.ArrayOps#ofBoolean.sliceImpl"
208-
problemName=DirectMissingMethodProblem
209-
},
210-
{
211-
matchName="scala.collection.mutable.ArrayOps#ofBoolean.emptyImpl"
212-
problemName=DirectMissingMethodProblem
213-
},
214-
{
215-
matchName="scala.collection.mutable.ArrayOps#ofShort.sliceImpl$extension"
216-
problemName=DirectMissingMethodProblem
217-
},
218-
{
219-
matchName="scala.collection.mutable.ArrayOps#ofShort.emptyImpl$extension"
220-
problemName=DirectMissingMethodProblem
221-
},
222-
{
223-
matchName="scala.collection.mutable.WrappedArray#ofShort.sliceImpl"
224-
problemName=DirectMissingMethodProblem
225-
},
226-
{
227-
matchName="scala.collection.mutable.WrappedArray#ofShort.emptyImpl"
228-
problemName=DirectMissingMethodProblem
229-
},
230-
{
231-
matchName="scala.collection.mutable.WrappedArray#ofRef.sliceImpl"
232-
problemName=DirectMissingMethodProblem
233-
},
234-
{
235-
matchName="scala.collection.mutable.WrappedArray#ofRef.emptyImpl"
236-
problemName=DirectMissingMethodProblem
237-
},
238-
{
239-
matchName="scala.collection.mutable.WrappedArray#ofUnit.sliceImpl"
240-
problemName=DirectMissingMethodProblem
241-
},
242-
{
243-
matchName="scala.collection.mutable.WrappedArray#ofUnit.emptyImpl"
244-
problemName=DirectMissingMethodProblem
245-
},
246-
{
247-
matchName="scala.collection.mutable.ArrayOps#ofByte.sliceImpl$extension"
248-
problemName=DirectMissingMethodProblem
249-
},
250-
{
251-
matchName="scala.collection.mutable.ArrayOps#ofByte.emptyImpl$extension"
252-
problemName=DirectMissingMethodProblem
253-
},
254-
{
255-
matchName="scala.collection.mutable.ArrayOps#ofDouble.sliceImpl$extension"
256-
problemName=DirectMissingMethodProblem
257-
},
258-
{
259-
matchName="scala.collection.mutable.ArrayOps#ofDouble.emptyImpl$extension"
260-
problemName=DirectMissingMethodProblem
261-
},
262-
{
263-
matchName="scala.collection.mutable.ArrayOpsImpl"
264-
problemName=MissingClassProblem
265-
},
266-
{
267-
matchName="scala.collection.mutable.WrappedArray#ofInt.sliceImpl"
268-
problemName=DirectMissingMethodProblem
269-
},
270-
{
271-
matchName="scala.collection.mutable.WrappedArray#ofInt.emptyImpl"
272-
problemName=DirectMissingMethodProblem
273-
},
274-
{
275-
matchName="scala.collection.mutable.ArrayOps$ofDouble"
276-
problemName=MissingTypesProblem
277-
},
278-
{
279-
matchName="scala.collection.mutable.ArrayOps#ofDouble.sliceImpl"
280-
problemName=DirectMissingMethodProblem
281-
},
282-
{
283-
matchName="scala.collection.mutable.ArrayOps#ofDouble.emptyImpl"
284-
problemName=DirectMissingMethodProblem
285-
},
286-
{
287-
matchName="scala.collection.mutable.ArrayOps$ofRef"
288-
problemName=MissingTypesProblem
289-
},
290-
{
291-
matchName="scala.collection.mutable.ArrayOps#ofRef.sliceImpl"
292-
problemName=DirectMissingMethodProblem
293-
},
294-
{
295-
matchName="scala.collection.mutable.ArrayOps#ofRef.emptyImpl"
296-
problemName=DirectMissingMethodProblem
297-
},
298-
{
299-
matchName="scala.collection.mutable.WrappedArray#ofLong.sliceImpl"
300-
problemName=DirectMissingMethodProblem
301-
},
302-
{
303-
matchName="scala.collection.mutable.WrappedArray#ofLong.emptyImpl"
304-
problemName=DirectMissingMethodProblem
305-
},
306-
{
307-
matchName="scala.collection.mutable.ArrayOps$ofByte"
308-
problemName=MissingTypesProblem
309-
},
310-
{
311-
matchName="scala.collection.mutable.ArrayOps#ofByte.sliceImpl"
312-
problemName=DirectMissingMethodProblem
313-
},
314-
{
315-
matchName="scala.collection.mutable.ArrayOps#ofByte.emptyImpl"
316-
problemName=DirectMissingMethodProblem
317-
},
318-
{
319-
matchName="scala.collection.mutable.ArrayOps#ofFloat.sliceImpl$extension"
320-
problemName=DirectMissingMethodProblem
321-
},
322-
{
323-
matchName="scala.collection.mutable.ArrayOps#ofFloat.emptyImpl$extension"
324-
problemName=DirectMissingMethodProblem
325-
},
326-
{
327-
matchName="scala.collection.mutable.ArrayOps#ofLong.sliceImpl$extension"
328-
problemName=DirectMissingMethodProblem
329-
},
330-
{
331-
matchName="scala.collection.mutable.ArrayOps#ofLong.emptyImpl$extension"
332-
problemName=DirectMissingMethodProblem
333-
},
334-
{
335-
matchName="scala.collection.mutable.ArrayOps#ofBoolean.sliceImpl$extension"
336-
problemName=DirectMissingMethodProblem
337-
},
338-
{
339-
matchName="scala.collection.mutable.ArrayOps#ofBoolean.emptyImpl$extension"
340-
problemName=DirectMissingMethodProblem
341-
},
342-
{
343-
matchName="scala.collection.mutable.WrappedArray$ofByte"
344-
problemName=MissingTypesProblem
345-
},
346-
{
347-
matchName="scala.collection.mutable.WrappedArray$ofBoolean"
348-
problemName=MissingTypesProblem
349-
},
350-
{
351-
matchName="scala.collection.mutable.WrappedArray$ofChar"
352-
problemName=MissingTypesProblem
353-
},
354-
{
355-
matchName="scala.collection.mutable.WrappedArray$ofDouble"
356-
problemName=MissingTypesProblem
357-
},
358-
{
359-
matchName="scala.collection.mutable.WrappedArray$ofShort"
360-
problemName=MissingTypesProblem
361-
},
362-
{
363-
matchName="scala.collection.mutable.WrappedArray$ofRef"
364-
problemName=MissingTypesProblem
365-
},
366-
{
367-
matchName="scala.collection.mutable.WrappedArray$ofUnit"
368-
problemName=MissingTypesProblem
369-
},
370-
{
371-
matchName="scala.collection.mutable.WrappedArray$ofInt"
372-
problemName=MissingTypesProblem
373-
},
374-
{
375-
matchName="scala.collection.mutable.WrappedArrayImpl"
376-
problemName=MissingClassProblem
377-
},
378-
{
379-
matchName="scala.collection.mutable.WrappedArray$ofLong"
380-
problemName=MissingTypesProblem
381-
},
382-
{
383-
matchName="scala.collection.mutable.WrappedArray$ofFloat"
384-
problemName=MissingTypesProblem
385-
},
386-
{
387-
matchName="scala.collection.mutable.WrappedArray#ofFloat.sliceImpl"
388-
problemName=DirectMissingMethodProblem
389-
},
390-
{
391-
matchName="scala.collection.mutable.WrappedArray#ofFloat.emptyImpl"
392-
problemName=DirectMissingMethodProblem
393-
},
394-
{
395-
matchName="scala.collection.mutable.ArrayOps$ofLong"
396-
problemName=MissingTypesProblem
397-
},
398-
{
399-
matchName="scala.collection.mutable.ArrayOps#ofLong.sliceImpl"
400-
problemName=DirectMissingMethodProblem
401-
},
402-
{
403-
matchName="scala.collection.mutable.ArrayOps#ofLong.emptyImpl"
404-
problemName=DirectMissingMethodProblem
405-
},
406-
{
407-
matchName="scala.collection.mutable.ArrayOps$ofFloat"
408-
problemName=MissingTypesProblem
409-
},
410-
{
411-
matchName="scala.collection.mutable.ArrayOps#ofFloat.sliceImpl"
412-
problemName=DirectMissingMethodProblem
413-
},
414-
{
415-
matchName="scala.collection.mutable.ArrayOps#ofFloat.emptyImpl"
416-
problemName=DirectMissingMethodProblem
417-
},
418-
// introduce FilteredTraversableInternal
419-
{
420-
matchName="scala.collection.immutable.Nil$"
421-
problemName=MissingTypesProblem
422-
},
423-
{
424-
matchName="scala.collection.immutable.FilteredTraversableInternal"
425-
problemName=MissingClassProblem
426-
},
427-
{
428-
matchName="scala.collection.immutable.List"
429-
problemName=MissingTypesProblem
430-
},
431-
{
432-
matchName="scala.collection.immutable.$colon$colon"
433-
problemName=MissingTypesProblem
434-
},
43590
{
43691
matchName="scala.annotation.showAsInfix$"
43792
problemName=MissingClassProblem

0 commit comments

Comments
 (0)