diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2017-04-04 20:07:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 20:07:34 +0200 |
commit | 94dd1dcb3f062cf96f84507abab417f7bea78e8c (patch) | |
tree | b3c8c976c6ab64ca2958412082b912ef4e70048a /src/library/scala/collection/immutable/List.scala | |
parent | 6008e4b295ecb3697b39ee0deacb2136eeae94f4 (diff) | |
parent | 73c9693c8aced6945b75faa5e3765b7bc6ec21e9 (diff) | |
download | scala-94dd1dcb3f062cf96f84507abab417f7bea78e8c.tar.gz scala-94dd1dcb3f062cf96f84507abab417f7bea78e8c.tar.bz2 scala-94dd1dcb3f062cf96f84507abab417f7bea78e8c.zip |
Merge pull request #5821 from adriaanm/revert-5664-binco
Revert #5664 because the binary incompatible change leaks via erasure
Diffstat (limited to 'src/library/scala/collection/immutable/List.scala')
-rw-r--r-- | src/library/scala/collection/immutable/List.scala | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index e878f49c32..8e8bf953f3 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -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 @@ -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. |