diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/TraversableLike.scala | 32 | ||||
| -rw-r--r-- | src/library/scala/parallel/Future.scala | 28 |
2 files changed, 31 insertions, 29 deletions
diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala index 32d697ebb4..6fa05bd85b 100644 --- a/src/library/scala/collection/TraversableLike.scala +++ b/src/library/scala/collection/TraversableLike.scala @@ -9,7 +9,7 @@ package scala.collection import generic._ -import mutable.{ Builder, ListBuffer } +import mutable.{ Builder } import annotation.{tailrec, migration, bridge} import annotation.unchecked.{ uncheckedVariance => uV } import parallel.ParIterable @@ -193,8 +193,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] b.result } - /** As with `++`, returns a new collection containing the elements from the left operand followed by the - * elements from the right operand. + /** As with `++`, returns a new collection containing the elements from the + * left operand followed by the elements from the right operand. * It differs from `++` in that the right operand determines the type of * the resulting collection rather than the left one. * @@ -223,9 +223,6 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] * @param bf $bfinfo * @return a new collection of type `That` which contains all elements * of this $coll followed by all elements of `that`. - * - * @return a new $coll which contains all elements of this $coll - * followed by all elements of `that`. */ def ++:[B >: A, That](that: Traversable[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = (that ++ seq)(breakOut) @@ -423,7 +420,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] /** Optionally selects the first element. * $orderDependent - * @return the first element of this $coll if it is nonempty, `None` if it is empty. + * @return the first element of this $coll if it is nonempty, + * `None` if it is empty. */ def headOption: Option[A] = if (isEmpty) None else Some(head) @@ -452,7 +450,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] /** Optionally selects the last element. * $orderDependent - * @return the last element of this $coll$ if it is nonempty, `None` if it is empty. + * @return the last element of this $coll$ if it is nonempty, + * `None` if it is empty. */ def lastOption: Option[A] = if (isEmpty) None else Some(last) @@ -486,7 +485,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] } else sliceWithKnownDelta(n, Int.MaxValue, -n) - def slice(from: Int, until: Int): Repr = sliceWithKnownBound(math.max(from, 0), until) + def slice(from: Int, until: Int): Repr = + sliceWithKnownBound(math.max(from, 0), until) // Precondition: from >= 0, until > 0, builder already configured for building. private[this] def sliceInternal(from: Int, until: Int, b: Builder[A, Repr]): Repr = { @@ -615,8 +615,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] /** Converts this $coll to a string. * * @return a string representation of this collection. By default this - * string consists of the `stringPrefix` of this $coll, - * followed by all elements separated by commas and enclosed in parentheses. + * string consists of the `stringPrefix` of this $coll, followed + * by all elements separated by commas and enclosed in parentheses. */ override def toString = mkString(stringPrefix + "(", ", ", ")") @@ -670,8 +670,8 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] * @param p the predicate used to test elements. * @return an object of class `WithFilter`, which supports * `map`, `flatMap`, `foreach`, and `withFilter` operations. - * All these operations apply to those elements of this $coll which - * satisfy the predicate `p`. + * All these operations apply to those elements of this $coll + * which satisfy the predicate `p`. */ def withFilter(p: A => Boolean): FilterMonadic[A, Repr] = new WithFilter(p) @@ -719,8 +719,10 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] * * @usecase def flatMap[B](f: A => TraversableOnce[B]): $Coll[B] * - * @return a new $coll resulting from applying the given collection-valued function - * `f` to each element of the outer $coll that satisfies predicate `p` and concatenating the results. + * @return a new $coll resulting from applying the given + * collection-valued function `f` to each element of the + * outer $coll that satisfies predicate `p` and concatenating + * the results. */ def flatMap[B, That](f: A => GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = { val b = bf(repr) diff --git a/src/library/scala/parallel/Future.scala b/src/library/scala/parallel/Future.scala index 29faa06148..af06852b32 100644 --- a/src/library/scala/parallel/Future.scala +++ b/src/library/scala/parallel/Future.scala @@ -1,22 +1,24 @@ -package scala.parallel - - - - - +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2005-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ +package scala.parallel -/** A future is a function without parameters that will block the caller if the - * parallel computation associated with the function is not completed. +/** A future is a function without parameters that will block the caller if + * the parallel computation associated with the function is not completed. * * @since 2.9 */ trait Future[@specialized +R] extends (() => R) { - /** Returns a result once the parallel computation completes. If the computation - * produced an exception, an exception is forwarded. + /** Returns a result once the parallel computation completes. If the + * computation produced an exception, an exception is forwarded. * - * '''Note:''' creating a circular dependency between futures by calling this method will - * result in a deadlock. + * '''Note:''' creating a circular dependency between futures by calling + * this method will result in a deadlock. * * @tparam R the type of the result * @return the result @@ -31,5 +33,3 @@ trait Future[@specialized +R] extends (() => R) { def isDone(): Boolean } - - |