diff options
author | Paul Phillips <paulp@improving.org> | 2013-09-18 00:09:46 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-09-18 07:13:38 -0700 |
commit | f4267ccd96a9143c910c66a5b0436aaa64b7c9dc (patch) | |
tree | 174861715807c23ba332f78769a9f7e1377b7f02 /src/library/scala/collection/generic | |
parent | d45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (diff) | |
download | scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.gz scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.bz2 scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.zip |
Cull extraneous whitespace.
One last flurry with the broom before I leave you slobs to code
in your own filth. Eliminated all the trailing whitespace I
could manage, with special prejudice reserved for the test cases
which depended on the preservation of trailing whitespace.
Was reminded I cannot figure out how to eliminate the trailing
space on the "scala> " prompt in repl transcripts. At least
reduced the number of such empty prompts by trimming transcript
code on the way in.
Routed ConsoleReporter's "printMessage" through a trailing
whitespace stripping method which might help futureproof
against the future of whitespace diseases. Deleted the up-to-40
lines of trailing whitespace found in various library files.
It seems like only yesterday we performed whitespace surgery
on the whole repo. Clearly it doesn't stick very well. I suggest
it would work better to enforce a few requirements on the way in.
Diffstat (limited to 'src/library/scala/collection/generic')
6 files changed, 5 insertions, 39 deletions
diff --git a/src/library/scala/collection/generic/GenericSeqCompanion.scala b/src/library/scala/collection/generic/GenericSeqCompanion.scala index 34b20f23a2..fd1e18a029 100644 --- a/src/library/scala/collection/generic/GenericSeqCompanion.scala +++ b/src/library/scala/collection/generic/GenericSeqCompanion.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ - package scala package collection package generic diff --git a/src/library/scala/collection/generic/IsSeqLike.scala b/src/library/scala/collection/generic/IsSeqLike.scala index 189aea4632..4c857ad1bb 100644 --- a/src/library/scala/collection/generic/IsSeqLike.scala +++ b/src/library/scala/collection/generic/IsSeqLike.scala @@ -50,7 +50,7 @@ object IsSeqLike { val conversion = implicitly[String => SeqLike[Char, String]] } - implicit def seqLikeRepr[C[_], A0](implicit conv: C[A0] => SeqLike[A0,C[A0]]): IsSeqLike[C[A0]] { type A = A0 } = + implicit def seqLikeRepr[C[_], A0](implicit conv: C[A0] => SeqLike[A0,C[A0]]): IsSeqLike[C[A0]] { type A = A0 } = new IsSeqLike[C[A0]] { type A = A0 val conversion = conv diff --git a/src/library/scala/collection/generic/ParFactory.scala b/src/library/scala/collection/generic/ParFactory.scala index 486e2a115e..4486cea419 100644 --- a/src/library/scala/collection/generic/ParFactory.scala +++ b/src/library/scala/collection/generic/ParFactory.scala @@ -37,8 +37,3 @@ extends GenTraversableFactory[CC] override def apply() = newBuilder[A] } } - - - - - diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index b7412afde0..b5ec568667 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ - package scala package collection package generic @@ -49,7 +48,3 @@ trait Shrinkable[-A] { */ def --=(xs: TraversableOnce[A]): this.type = { xs.seq foreach -= ; this } } - - - - diff --git a/src/library/scala/collection/generic/Signalling.scala b/src/library/scala/collection/generic/Signalling.scala index e62eb6ff09..021d289c9d 100644 --- a/src/library/scala/collection/generic/Signalling.scala +++ b/src/library/scala/collection/generic/Signalling.scala @@ -10,13 +10,8 @@ package scala package collection package generic - import java.util.concurrent.atomic.AtomicInteger - - - - /** * A message interface serves as a unique interface to the * part of the collection capable of receiving messages from @@ -97,7 +92,6 @@ trait Signalling { def tag: Int } - /** * This signalling implementation returns default values and ignores received signals. */ @@ -110,13 +104,11 @@ class DefaultSignalling extends Signalling with VolatileAbort { def tag = -1 } - /** * An object that returns default values and ignores received signals. */ object IdleSignalling extends DefaultSignalling - /** * A mixin trait that implements abort flag behaviour using volatile variables. */ @@ -126,7 +118,6 @@ trait VolatileAbort extends Signalling { override def abort() = abortflag = true } - /** * A mixin trait that implements index flag behaviour using atomic integers. * The `setIndex` operation is wait-free, while conditional set operations `setIndexIfGreater` @@ -154,7 +145,6 @@ trait AtomicIndexFlag extends Signalling { } } - /** * An implementation of the signalling interface using delegates. */ @@ -175,25 +165,12 @@ trait DelegatedSignalling extends Signalling { def tag = signalDelegate.tag } - /** * Class implementing delegated signalling. */ class DelegatedContext(var signalDelegate: Signalling) extends DelegatedSignalling - /** * Class implementing delegated signalling, but having its own distinct `tag`. */ class TaggedDelegatedContext(deleg: Signalling, override val tag: Int) extends DelegatedContext(deleg) - - - - - - - - - - - diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index 3876da3275..ab0d443a03 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -79,14 +79,14 @@ trait Sorted[K, +This <: Sorted[K, This]] { else until(next) } - + /** * Creates an iterator over all the keys(or elements) contained in this * collection greater than or equal to `start` - * according to the ordering of this collection. x.keysIteratorFrom(y) - * is equivalent to but often more efficient than + * according to the ordering of this collection. x.keysIteratorFrom(y) + * is equivalent to but often more efficient than * x.from(y).keysIterator. - * + * * @param start The lower bound (inclusive) * on the keys to be returned */ |