8000 Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214 · scala/scala@d66d843 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit d66d843

Browse files
SethTisueSethTisue
committed
Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214
2 parents 6be69d6 + 0965028 commit d66d843

File tree

26 files changed

+1607
-66
lines changed

26 files changed

+1607
-66
lines changed

‎bincompat-backward.whitelist.conf

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

0 commit comments

Comments
 (0)
0