8000 Revert #5664 because the binary incompatible change leaks via erasure by adriaanm · Pull Request #5821 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Revert #5664 because the binary incompatible change leaks via erasure #5821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 4, 2017
Merged

Revert #5664 because the binary incompatible change leaks via erasure #5821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c3d3cb
Revert "Handle WrappedArray the same way as ArrayOps for binary compa…
adriaanm Apr 3, 2017
fe20cce
Revert "Optimised implementation of List.filter/filterNot"
adriaanm Apr 3, 2017
73c9693
Revert "Optimize slice and take in ArrayOps, WrappedArray"
adriaanm Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Optimised implementation of List.filter/filterNot" 
This reverts commit eb5c513.
  • Loading branch information
@adriaanm
adriaanm committed Apr 3, 2017
commit fe20cce42b879cdc25bd31af2b55091794cc11be
17 changes: 0 additions & 17 deletions bincompat-forward.whitelist.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,23 +924,6 @@ filter {
{
matchName="scala.collection.mutable.ArrayOps#ofFloat.emptyImpl"
problemName=DirectMissingMethodProblem
},
// introduce FilteredTraversableInternal
{
matchName="sc 8000 ala.collection.immutable.Nil$"
problemName=MissingTypesProblem
},
{
matchName="scala.collection.immutable.FilteredTraversableInternal"
problemName=MissingClassProblem
},
{
matchName="scala.collection.immutable.List"
problemName=MissingTypesProblem
},
{
matchName="scala.collection.immutable.$colon$colon"
problemName=MissingTypesProblem
}
]
}
104 changes: 0 additions & 104 deletions src/library/scala/collection/immutable/FilteredTraversableInternal.scala
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/library/scala/collection/immutable/List.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ sealed abstract class List[+A] extends AbstractSeq[A]
with Product
with GenericTraversableTemplate[A, List]
with LinearSeqOptimized[A, List[A]]
with FilteredTraversableInternal[A, List[A]]
with Serializable {
override def companion: GenericCompanion[List] = List

Expand Down Expand Up @@ -417,7 +416,6 @@ sealed abstract class List[+A] extends AbstractSeq[A]
// Create a proxy for Java serialization that allows us to avoid mutation
// during de-serialization. This is the Serialization Proxy Pattern.
protected final def writeReplace(): AnyRef = new List.SerializationProxy(this)

}

/** The empty list.
Expand Down
2 changes: 1 addition & 1 deletion src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@ trait JavaUniverseForce { self: runtime.JavaUniverse =>
definitions.DoubleTpe
definitions.BooleanTpe
definitions.ScalaNumericValueClasses
definitions.ScalaValueClasses
definitions.ScalaValueClassesNoUnit
definitions.ScalaValueClasses

uncurry.VarargsSymbolAttachment
uncurry.DesugaredParameterType
Expand Down
8 changes: 4 additions & 4 deletions test/files/run/repl-colon-type.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ TypeRef(
)
TypeRef(
TypeSymbol(
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable

)
args = List(
Expand Down Expand Up @@ -142,7 +142,7 @@ TypeRef(
args = List(
TypeRef(
TypeSymbol(
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable

)
args = List(
Expand Down Expand Up @@ -175,7 +175,7 @@ PolyType(
args = List(
TypeRef(
TypeSymbol(
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable

)
args = List(TypeParamTypeRef(TypeParam(T <: AnyVal)))
Expand All @@ -198,7 +198,7 @@ PolyType(
params = List(TermSymbol(x: T), TermSymbol(y: List[U]))
resultType = TypeRef(
TypeSymbol(
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable
sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable

)
args = List(TypeParamTypeRef(TypeParam(U >: T)))
Expand Down
0