summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/JavaConversions.scala25
-rw-r--r--src/library/scala/xml/dtd/ContentModel.scala1
2 files changed, 13 insertions, 13 deletions
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index f67fd47708..fad990e140 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -678,18 +678,19 @@ object JavaConversions {
}
}
- def remove() = prev match {
- case Some(k) =>
- underlying match {
- case mm: mutable.Map[A, _] =>
- val v = mm remove k.asInstanceOf[A]
- prev = None
- v
- case _ =>
- throw new UnsupportedOperationException("remove")
- }
- case _ =>
- throw new IllegalStateException("next must be called at least once before remove")
+ def remove() {
+ prev match {
+ case Some(k) =>
+ underlying match {
+ case mm: mutable.Map[A, _] =>
+ mm remove k.asInstanceOf[A]
+ prev = None
+ case _ =>
+ throw new UnsupportedOperationException("remove")
+ }
+ case _ =>
+ throw new IllegalStateException("next must be called at least once before remove")
+ }
}
}
}
diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala
index cae2236346..1e9a3a4b58 100644
--- a/src/library/scala/xml/dtd/ContentModel.scala
+++ b/src/library/scala/xml/dtd/ContentModel.scala
@@ -52,7 +52,6 @@ object ContentModel extends WordExp {
sb append sep
buildString(z, sb)
}
- sb
}
def buildString(c: ContentModel, sb: StringBuilder): StringBuilder = c match {