diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 23:00:47 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 23:00:47 +0100 |
commit | 8cdf3b3f51adff8dbeff5217505f74cfbedb55cd (patch) | |
tree | 5b249995c452ed79fc0ba39410775920380b3de3 /src/library/scala/collection/generic | |
parent | e7ab2f4a978e244cdd4c8c03170caa2a44c7adea (diff) | |
download | scala-8cdf3b3f51adff8dbeff5217505f74cfbedb55cd.tar.gz scala-8cdf3b3f51adff8dbeff5217505f74cfbedb55cd.tar.bz2 scala-8cdf3b3f51adff8dbeff5217505f74cfbedb55cd.zip |
Banish needless semicolons.
Diffstat (limited to 'src/library/scala/collection/generic')
-rw-r--r-- | src/library/scala/collection/generic/Signalling.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/generic/Sorted.scala | 16 | ||||
-rw-r--r-- | src/library/scala/collection/generic/SortedSetFactory.scala | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/library/scala/collection/generic/Signalling.scala b/src/library/scala/collection/generic/Signalling.scala index 498db7f8fa..1f2f224283 100644 --- a/src/library/scala/collection/generic/Signalling.scala +++ b/src/library/scala/collection/generic/Signalling.scala @@ -140,7 +140,7 @@ trait AtomicIndexFlag extends Signalling { val old = intflag.get if (f <= old) loop = false else if (intflag.compareAndSet(old, f)) loop = false - } while (loop); + } while (loop) } abstract override def setIndexFlagIfLesser(f: Int) = { var loop = true @@ -148,7 +148,7 @@ trait AtomicIndexFlag extends Signalling { val old = intflag.get if (f >= old) loop = false else if (intflag.compareAndSet(old, f)) loop = false - } while (loop); + } while (loop) } } diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index b3847fffc9..997a136d30 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -95,16 +95,16 @@ trait Sorted[K, +This <: Sorted[K, This]] { val i = keySet.iterator if (i.isEmpty) return j.isEmpty - var in = i.next; + var in = i.next while (j.hasNext) { - val jn = j.next; + val jn = j.next while ({ - val n = compare(jn, in); - if (n == 0) false; - else if (n < 0) return false; - else if (!i.hasNext) return false; - else true; - }) in = i.next; + val n = compare(jn, in) + if (n == 0) false + else if (n < 0) return false + else if (!i.hasNext) return false + else true + }) in = i.next } true } diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index 08bca04e42..2993209628 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -27,7 +27,7 @@ abstract class SortedSetFactory[CC[A] <: SortedSet[A] with SortedSetLike[A, CC[A def newBuilder[A](implicit ord: Ordering[A]): Builder[A, CC[A]] = new SetBuilder[A, CC[A]](empty) - implicit def newCanBuildFrom[A](implicit ord : Ordering[A]) : CanBuildFrom[Coll, A, CC[A]] = new SortedSetCanBuildFrom()(ord); + implicit def newCanBuildFrom[A](implicit ord : Ordering[A]) : CanBuildFrom[Coll, A, CC[A]] = new SortedSetCanBuildFrom()(ord) class SortedSetCanBuildFrom[A](implicit ord: Ordering[A]) extends CanBuildFrom[Coll, A, CC[A]] { def apply(from: Coll) = newBuilder[A](ord) |