summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/mutable
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-31 16:06:56 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-31 16:06:56 -0700
commit5654ebddb63d078f9f79dcf84fbb8489030136f6 (patch)
treed4bfc365cdf8e4993113275136f14803ceab3abd /src/library/scala/collection/mutable
parent4fc7d5517c7152d43745960efde5042febe29422 (diff)
parent5e5ab186fe5b8cf047fd3da58da29dbc8f9fbd71 (diff)
downloadscala-5654ebddb63d078f9f79dcf84fbb8489030136f6.tar.gz
scala-5654ebddb63d078f9f79dcf84fbb8489030136f6.tar.bz2
scala-5654ebddb63d078f9f79dcf84fbb8489030136f6.zip
Merge pull request #4971 from adriaanm/genbcode-delambdafy
Unify treatment of built-in functions and SAMs
Diffstat (limited to 'src/library/scala/collection/mutable')
-rw-r--r--src/library/scala/collection/mutable/AnyRefMap.scala6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/library/scala/collection/mutable/AnyRefMap.scala b/src/library/scala/collection/mutable/AnyRefMap.scala
index 2ed5bbea60..6ff79dd1b8 100644
--- a/src/library/scala/collection/mutable/AnyRefMap.scala
+++ b/src/library/scala/collection/mutable/AnyRefMap.scala
@@ -419,7 +419,11 @@ object AnyRefMap {
private final val VacantBit = 0x40000000
private final val MissVacant = 0xC0000000
- private val exceptionDefault = (k: Any) => throw new NoSuchElementException(if (k == null) "(null)" else k.toString)
+ @SerialVersionUID(1L)
+ private class ExceptionDefault extends (Any => Nothing) with Serializable {
+ def apply(k: Any): Nothing = throw new NoSuchElementException(if (k == null) "(null)" else k.toString)
+ }
+ private val exceptionDefault = new ExceptionDefault
implicit def canBuildFrom[K <: AnyRef, V, J <: AnyRef, U]: CanBuildFrom[AnyRefMap[K,V], (J, U), AnyRefMap[J,U]] =
new CanBuildFrom[AnyRefMap[K,V], (J, U), AnyRefMap[J,U]] {