Skip to content

Commit a24ca7f

Browse files
SethTisueSethTisue
committed
Merge pull request scala#4803 from janekdb/2.11.x-conform-foreach-tparam
Conform foreach tparam to majority naming convention
2 parents e6c8861 + 6ed7010 commit a24ca7f

27 files changed

+170
-169
lines changed

‎src/library/scala/collection/BitSetLike.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ trait BitSetLike[+This <: BitSetLike[This] with SortedSet[Int]] extends SortedSe
115115
else Iterator.empty.next()
116116
}
117117

118-
override def foreach[B](f: Int => B) {
118+
override def foreach[U](f: Int => U) {
119119
/* NOTE: while loops are significantly faster as of 2.11 and
120120
one major use case of bitsets is performance. Also, there
121121
is nothing to do when all bits are clear, so use that as

‎src/library/scala/collection/GenTraversableLike.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,16 @@ trait GenTraversableLike[+A, +Repr] extends Any with GenTraversableOnce[A] with
269269
* {{{
270270
* scala> val a = List(1)
271271
* a: List[Int] = List(1)
272-
*
272+
*
273273
* scala> val b = List(2)
274274
* b: List[Int] = List(2)
275-
*
275+
*
276276
* scala> val c = a ++ b
277277
* c: List[Int] = List(1, 2)
278-
*
278+
*
279279
* scala> val d = List('a')
280280
* d: List[Char] = List(a)
281-
*
281+
*
282282
* scala> val e = c ++ d
283283
* e: List[AnyVal] = List(1, 2, a)
284284
* }}}

‎src/library/scala/collection/Iterator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ trait Iterator[+A] extends TraversableOnce[A] {
851851
* @usecase def foreach(f: A => Unit): Unit
852852
* @inheritdoc
853853
*/
854-
def foreach[U](f: A => U) { while (hasNext) f(next()) }
854+
def foreach[U](f: A => U) { while (hasNext) f(next()) }
855855

856856
/** Tests whether a predicate holds for all values produced by this iterator.
857857
* $mayNotTerminateInf

‎src/library/scala/collection/LinearSeqOptimized.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ trait LinearSeqOptimized[+A, +Repr <: LinearSeqOptimized[A, Repr]] extends Linea
6767
}
6868

6969
override /*IterableLike*/
70-
def foreach[B](f: A => B) {
70+
def foreach[U](f: A => U) {
7171
var these = this
7272
while (!these.isEmpty) {
7373
f(these.head)

‎src/library/scala/collection/MapLike.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ self =>
171171
def + (elem: A): Set[A] = (Set[A]() ++ this + elem).asInstanceOf[Set[A]] // !!! concrete overrides abstract problem
172172
def - (elem: A): Set[A] = (Set[A]() ++ this - elem).asInstanceOf[Set[A]] // !!! concrete overrides abstract problem
173173
override def size = self.size
174-
override def foreach[C](f: A => C) = self.keysIterator foreach f
174+
override def foreach[U](f: A => U) = self.keysIterator foreach f
175175
}
176176

177177
/** Creates an iterator for all keys.
@@ -203,7 +203,7 @@ self =>
203203
protected class DefaultValuesIterable extends AbstractIterable[B] with Iterable[B] with Serializable {
204204
def iterator = valuesIterator
205205
override def size = self.size
206-
override def foreach[C](f: B => C) = self.valuesIterator foreach f
206+
override def foreach[U](f: B => U) = self.valuesIterator foreach f
207207
}
208208

209209
/** Creates an iterator for all values in this map.
@@ -228,7 +228,7 @@ self =>
228228
throw new NoSuchElementException("key not found: " + key)
229229

230230
protected class FilteredKeys(p: A => Boolean) extends AbstractMap[A, B] with DefaultMap[A, B] {
231-
override def foreach[C](f: ((A, B)) => C): Unit = for (kv <- self) if (p(kv._1)) f(kv)
231+
override def foreach[U](f: ((A, B)) => U): Unit = for (kv <- self) if (p(kv._1)) f(kv)
232232
def iterator = self.iterator.filter(kv => p(kv._1))
233233
override def contains(key: A) = self.contains(key) && p(key)
234234
def get(key: A) = if (!p(key)) None else self.get(key)
@@ -242,7 +242,7 @@ self =>
242242
def filterKeys(p: A => Boolean): Map[A, B] = new FilteredKeys(p)
243243

244244
protected class MappedValues[C](f: B => C) extends AbstractMap[A, C] with DefaultMap[A, C] {
245-
override def foreach[D](g: ((A, C)) => D): Unit = for ((k, v) <- self) g((k, f(v)))
245+
override def foreach[U](g: ((A, C)) => U): Unit = for ((k, v) <- self) g((k, f(v)))
246246
def iterator = for ((k, v) <- self.iterator) yield (k, f(v))
247247
override def size = self.size
248248
override def contains(key: A) = self.contains(key)

‎src/library/scala/collection/Traversable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ trait Traversable[+A] extends TraversableLike[A, Traversable[A]]
3838
override def remove(p: A => Boolean): Traversable[A]
3939
override def partition(p: A => Boolean): (Traversable[A], Traversable[A])
4040
override def groupBy[K](f: A => K): Map[K, Traversable[A]]
41-
override def foreach[U](f: A => U): Unit
41+
override def foreach[U](f: A => U): Unit
4242
override def forall(p: A => Boolean): Boolean
4343
override def exists(p: A => Boolean): Boolean
4444
override def count(p: A => Boolean): Int

‎src/library/scala/collection/TraversableOnce.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ import scala.reflect.ClassTag
6161
trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
6262
self =>
6363

64-
/** Self-documenting abstract methods. */
64+
/* Self-documenting abstract methods. */
65+
6566
def foreach[U](f: A => U): Unit
6667
def isEmpty: Boolean
6768
def hasDefiniteSize: Boolean
@@ -334,10 +335,10 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
334335
* {{{
335336
* scala> val a = List(1,2,3,4)
336337
* a: List[Int] = List(1, 2, 3, 4)
337-
*
338+
*
338339
* scala> val b = new StringBuilder()
339-
* b: StringBuilder =
340-
*
340+
* b: StringBuilder =
341+
*
341342
* scala> a.addString(b , "List(" , ", " , ")")
342343
* res5: StringBuilder = List(1, 2, 3, 4)
343344
* }}}
@@ -376,7 +377,7 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
376377
* {{{
377378
* scala> val a = List(1,2,3,4)
378379
* a: List[Int] = List(1, 2, 3, 4)
379-
*
380+
*
380381
* scala> val b = new StringBuilder()
381382
* b: StringBuilder =
382383
*
@@ -399,7 +400,7 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
399400
* {{{
400401
* scala> val a = List(1,2,3,4)
401402
* a: List[Int] = List(1, 2, 3, 4)
402-
*
403+
*
403404
* scala> val b = new StringBuilder()
404405
* b: StringBuilder =
405406
*

‎src/library/scala/collection/TraversableProxyLike.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import scala.reflect.ClassTag
2828
trait TraversableProxyLike[+A, +Repr <: TraversableLike[A, Repr] with Traversable[A]] extends TraversableLike[A, Repr] with Proxy {
2929
def self: Repr
3030

31-
override def foreach[B](f: A => B): Unit = self.foreach(f)
31+
override def foreach[U](f: A => U): Unit = self.foreach(f)
3232
override def isEmpty: Boolean = self.isEmpty
3333
override def nonEmpty: Boolean = self.nonEmpty
3434
override def size: Int = self.size

‎src/library/scala/collection/generic/TraversableForwarder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait TraversableForwarder[+A] extends Traversable[A] {
3232
/** The traversable object to which calls are forwarded. */
3333
protected def underlying: Traversable[A]
3434

35-
override def foreach[B](f: A => B): Unit = underlying foreach f
35+
override def foreach[U](f: A => U): Unit = underlying foreach f
3636
override def isEmpty: Boolean = underlying.isEmpty
3737
override def nonEmpty: Boolean = underlying.nonEmpty
3838
override def size: Int = underlying.size

‎src/library/scala/collection/immutable/HashMap.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class HashMap[A, +B] extends AbstractMap[A, B]
4848

4949
def iterator: Iterator[(A,B)] = Iterator.empty
5050

51-
override def foreach[U](f: ((A, B)) => U): Unit = { }
51+
override def foreach[U](f: ((A, B)) => U): Unit = ()
5252

5353
def get(key: A): Option[B] =
5454
get0(key, computeHash(key), 0)
@@ -422,7 +422,7 @@ object HashMap extends ImmutableMapFactory[HashMap] with BitOperations.Int {
422422
final override def getElem(cc: AnyRef): (A, B) = cc.asInstanceOf[HashMap1[A, B]].ensurePair
423423
}
424424

425-
override def foreach[U](f: ((A, B)) => U): Unit = {
425+
override def foreach[U](f: ((A, B)) => U): Unit = {
426426
var i = 0
427427
while (i < elems.length) {
428428
elems(i).foreach(f)

0 commit comments

Comments
 (0)