diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-02-25 00:25:51 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-02-25 01:48:55 +0100 |
| commit | 256e46824636881f067ea0d312b5cbcdffbcf233 (patch) | |
| tree | 46ff04f70122f615a4af22a7bd7c8200ba395f88 /src/library | |
| parent | bc997702ef50d8621d12f855ee17819d89c542f1 (diff) | |
| download | scala-256e46824636881f067ea0d312b5cbcdffbcf233.tar.gz scala-256e46824636881f067ea0d312b5cbcdffbcf233.tar.bz2 scala-256e46824636881f067ea0d312b5cbcdffbcf233.zip | |
Remove redundant explicit returns.
Diffstat (limited to 'src/library')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/library/scala/collection/concurrent/TrieMap.scala b/src/library/scala/collection/concurrent/TrieMap.scala index 6bf9c1056a..491770dcf6 100644 --- a/src/library/scala/collection/concurrent/TrieMap.scala +++ b/src/library/scala/collection/concurrent/TrieMap.scala @@ -250,7 +250,7 @@ private[collection] final class INode[K, V](bn: MainNode[K, V], g: Gen) extends if (ct.isReadOnly || (startgen eq in.gen)) in.rec_lookup(k, hc, lev + 5, this, startgen, ct) else { if (GCAS(cn, cn.renewed(startgen, ct), ct)) rec_lookup(k, hc, lev, parent, startgen, ct) - else return RESTART // used to be throw RestartException + else RESTART // used to be throw RestartException } case sn: SNode[K, V] => // 2) singleton node if (sn.hc == hc && equal(sn.k, k, ct)) sn.v.asInstanceOf[AnyRef] diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index 68c43e682e..f9563cacc7 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -241,7 +241,7 @@ self => if (p(a(j).asInstanceOf[T])) j += 1 else return false } - return true + true } override def exists(p: T => Boolean): Boolean = { @@ -269,7 +269,7 @@ self => if (p(a(j).asInstanceOf[T])) return true else j += 1 } - return false + false } override def find(p: T => Boolean): Option[T] = { @@ -298,7 +298,7 @@ self => if (p(elem)) return Some(elem) else j += 1 } - return None + None } override def drop(n: Int): ParArrayIterator = { diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index 1a79e6da73..753dd0205e 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -227,7 +227,7 @@ object ScalaRunTime { if (iv == fv) return iv val lv = fv.toLong - if (lv == fv) return hash(lv) + if (lv == fv) hash(lv) else fv.hashCode } def hash(lv: Long): Int = { diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/library/scala/util/parsing/combinator/Parsers.scala index ead444653e..542a781b60 100644 --- a/src/library/scala/util/parsing/combinator/Parsers.scala +++ b/src/library/scala/util/parsing/combinator/Parsers.scala @@ -758,7 +758,7 @@ trait Parsers { if (elems.length == num) Success(elems.toList, in0) else p0(in0) match { case Success(x, rest) => elems += x ; applyp(rest) - case ns: NoSuccess => return ns + case ns: NoSuccess => ns } applyp(in) |