Skip to content

Commit 419a639

Browse files
adriaanmadriaanm
authored
Merge pull request scala#5701 from SethTisue/merge-2.11.x-to-2.12.x-20170214
[ci: last-only] merge 2.11.x onto 2.12.x (February 14, 2017)
2 parents c8b8005 + 71a8a44 commit 419a639

37 files changed

+1710
-133
lines changed

‎bincompat-backward.whitelist.conf

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,217 @@ filter {
4848
{
4949
matchName="scala.collection.immutable.HashMap#HashMapCollision1.contains0"
5050
problemName=DirectMissingMethodProblem
51+
},
52+
{
53+
matchName="scala.collection.mutable.ArrayOps.unzip"
54+
problemName=MissingMethodProblem
55+
},
56+
{
57+
matchName="scala.collection.mutable.ArrayOps.unzip3"
58+
problemName=MissingMethodProblem
59+
},
60+
{
61+
matchName="scala.collection.mutable.ArrayOps#ofFloat.unzip"
62+
problemName=IncompatibleMethTypeProblem
63+
},
64+
{
65+
matchName="scala.collection.mutable.ArrayOps#ofFloat.unzip3"
66+
problemName=IncompatibleMethTypeProblem
67+
},
68+
{
69+
matchName="scala.collection.mutable.ArrayOps#ofBoolean.unzip"
70+
problemName=IncompatibleMethTypeProblem
71+
},
72+
{
73+
matchName="scala.collection.mutable.ArrayOps#ofBoolean.unzip3"
74+
problemName=IncompatibleMethTypeProblem
75+
},
76+
{
77+
matchName="scala.collection.mutable.ArrayOps#ofRef.unzip"
78+
problemName=IncompatibleMethTypeProblem
79+
},
80+
{
81+
matchName="scala.collection.mutable.ArrayOps#ofRef.unzip3"
82+
problemName=IncompatibleMethTypeProblem
83+
},
84+
{
85+
matchName="scala.collection.mutable.ArrayOps#ofUnit.unzip"
86+
problemName=IncompatibleMethTypeProblem
87+
},
88+
{
89+
matchName="scala.collection.mutable.ArrayOps#ofUnit.unzip3"
90+
problemName=IncompatibleMethTypeProblem
91+
},
92+
{
93+
matchName="scala.collection.mutable.ArrayOps#ofDouble.unzip"
94+
problemName=IncompatibleMethTypeProblem
95+
},
96+
{
97+
matchName="scala.collection.mutable.ArrayOps#ofDouble.unzip3"
98+
problemName=IncompatibleMethTypeProblem
99+
},
100+
// see SI-8200
101+
{
102+
matchName="scala.reflect.api.StandardLiftables#StandardLiftableInstances.liftTree"
103+
problemName=MissingMethodProblem
104+
},
105+
// see SI-8331
106+
{
107+
matchName="scala.reflect.api.Internals#ReificationSupportApi#SyntacticTypeAppliedExtractor.unapply"
108+
problemName=IncompatibleResultTypeProblem
109+
},
110+
{
111+
matchName="scala.reflect.api.Internals#ReificationSupportApi#SyntacticTypeAppliedExtractor.unapply"
112+
problemName=MissingMethodProblem
113+
},
114+
{
115+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticSelectType"
116+
problemName=MissingMethodProblem
117+
},
118+
{
119+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticAppliedType"
120+
problemName=MissingMethodProblem
121+
},
122+
{
123+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticSelectTerm"
124+
problemName=MissingMethodProblem
125+
},
126+
// see SI-8366
127+
{
128+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticPartialFunction"
129+
problemName=MissingMethodProblem
130+
},
131+
{
132+
matchName="scala.reflect.api.Mirror.symbolOf"
133+
problemName=MissingMethodProblem
134+
},
135+
{
136+
matchName="scala.reflect.api.Mirror.typeOf"
137+
problemName=MissingMethodProblem
138+
},
139+
{
140+
matchName="scala.reflect.api.Mirror.weakTypeOf"
141+
problemName=MissingMethodProblem
142+
},
143+
// see SI-8388
144+
{
145+
matchName="scala.reflect.api.Internals$ReificationSupportApi$SyntacticIdentExtractor"
146+
problemName=MissingClassProblem
147+
},
148+
{
149+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticIdent"
150+
problemName=MissingMethodProblem
151+
},
152+
{
153+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticSingletonType"
154+
problemName=MissingMethodProblem
155+
},
156+
{
157+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticTermIdent"
158+
problemName=MissingMethodProblem
159+
},
160+
{
161+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticTypeIdent"
162+
problemName=MissingMethodProblem
163+
},
164+
{
165+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticCompoundType"
166+
problemName=MissingMethodProblem
167+
},
168+
{
169+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticAnnotatedType"
170+
problemName=MissingMethodProblem
171+
},
172+
{
173+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticTypeProjection"
174+
problemName=MissingMethodProblem
175+
},
176+
{
177+
matchName="scala.reflect.api.Internals#ReificationSupportApi.SyntacticExistentialType"
178+
problemName=MissingMethodProblem
179+
},
180+
{
181+
matchName="scala.reflect.runtime.SynchronizedOps.newNestedScope"
182+
problemName=MissingMethodProblem
183+
},
184+
// https://github.com/scala/scala/pull/3848 -- SI-8680
185+
{
186+
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"
187+
problemName=MissingMethodProblem
188+
},
189+
{
190+
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$5"
191+
problemName=MissingMethodProblem
192+
},
193+
{
194+
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$4"
195+
problemName=MissingMethodProblem
196+
},
197+
// SI-8946
198+
{
199+
matchName="scala.reflect.runtime.ThreadLocalStorage#MyThreadLocalStorage.values"
200+
problemName=MissingMethodProblem
201+
},
202+
// the below method was the unused private (sic!) method but the compatibility checker was complaining about it
203+
{
204+
matchName="scala.reflect.io.ZipArchive.scala$reflect$io$ZipArchive$$walkIterator"
205+
problemName=MissingMethodProblem
206+
},
207+
// SI-8362: AbstractPromise extends AtomicReference
208+
// It's ok to change a package-protected class in an impl package,
209+
// even though it's not clear why it changed -- bug in generic signature generation?
210+
// -public class scala.concurrent.impl.Promise$DefaultPromise<T> extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T>
211+
// +public class scala.concurrent.impl.Promise$DefaultPromise<T extends java.lang.Object> extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T>
212+
{
213+
matchName="scala.concurrent.impl.Promise$DefaultPromise"
214+
problemName=MissingTypesProblem
215+
},
216+
// SI-9488: Due to SI-8362 above, toString was silently changed to the AtomicReference toString implementation,
217+
// This is fixed by SI-9488, and this should be safe since the class in question is stdlib internal.
218+
{
219+
matchName="scala.concurrent.impl.Promise.toString"
220+
problemName=MissingMethodProblem
221+
},
222+
// https://github.com/scala/scala/pull/5652
223+
{
224+
matchName="scala.collection.mutable.ArrayOps#ofChar.slice"
225+
problemName=FinalMethodProblem
226+
},
227+
{
228+
matchName="scala.collection.mutable.ArrayOps#ofShort.slice"
229+
problemName=FinalMethodProblem
230+
},
231+
{
232+
matchName="scala.collection.mutable.ArrayOps#ofUnit.slice"
233+
problemName=FinalMethodProblem
234+
},
235+
{
236+
matchName="scala.collection.mutable.ArrayOps#ofInt.slice"
237+
problemName=FinalMethodProblem
238+
},
239+
{
240+
matchName="scala.collection.mutable.ArrayOps#ofBoolean.slice"
241+
problemName=FinalMethodProblem
242+
},
243+
{
244+
matchName="scala.collection.mutable.ArrayOps#ofDouble.slice"
245+
problemName=FinalMethodProblem
246+
},
247+
{
248+
matchName="scala.collection.mutable.ArrayOps#ofRef.slice"
249+
problemName=FinalMethodProblem
250+
},
251+
{
252+
matchName="scala.collection.mutable.ArrayOps#ofByte.slice"
253+
problemName=FinalMethodProblem
254+
},
255+
{
256+
matchName="scala.collection.mutable.ArrayOps#ofLong.slice"
257+
problemName=FinalMethodProblem
258+
},
259+
{
260+
matchName="scala.collection.mutable.ArrayOps#ofFloat.slice"
261+
problemName=FinalMethodProblem
51262
}
52263
]
53264
}

0 commit comments

Comments
 (0)