Following current style & structure proposals

Author: BalmungSan

src/main/scala/scala/collection/next/IterableOnceExtensions.scala

@@ -0,0 +1,41 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package scala.collection
+package next
+
+private[next] final class NextIterableOnceOpsExtensions[A, CC[_], C](
+  private val col: IterableOnceOps[A, CC, C]
+) extends AnyVal {
+  /**
+   * Partitions this IterableOnce into a map according to a discriminator function `key`. All the values that
+   * have the same discriminator are then transformed by the `value` function and then reduced into a
+   * single value with the `reduce` function.
+   *
+   * {{{
+   *   def occurrences[A](as: IterableOnce[A]): Map[A, Int] =
+   *     as.iterator.groupMapReduce(identity)(_ => 1)(_ + _)
+   * }}}
+   *
+   * @note This will force the evaluation of the Iterator.
+   */
+  def groupMapReduce[K, B](key: A => K)(f: A => B)(reduce: (B, B) => B): immutable.Map[K, B] = {
+    val m = mutable.Map.empty[K, B]
+    col.foreach { elem =>
+      m.updateWith(key = key(elem)) {
+        case Some(b) => Some(reduce(b, f(elem)))
+        case None    => Some(f(elem))
+      }
+    }
+    m.to(immutable.Map)
+  }
+}

src/main/scala/scala/collection/next/NextIterableOnceOpsExtensions.scala

@@ -0,0 +1,22 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package scala.collection
+
+import scala.language.implicitConversions
+
+package object next {
+  implicit final def scalaNextSyntaxForIterableOnceOps[A, CC[_], C](
+    col: IterableOnceOps[A, CC, C]
+  ): NextIterableOnceOpsExtensions[A, CC, C] =
+    new NextIterableOnceOpsExtensions(col)
+}

src/main/scala/scala/collection/next/package.scala

@@ -17,8 +17,6 @@ import org.junit.Test
 import scala.collection.IterableOnceOps
 import scala.collection.generic.IsIterableOnce
 
-import IterableOnceExtensions._
-
 final class TestIterableOnceExtensions {
   import TestIterableOnceExtensions.LowerCaseString
 
@@ -34,7 +32,7 @@ final class TestIterableOnceExtensions {
 
   @Test
   def iterableOnceOpsGroupMapReduce(): Unit = {
-    def occurrences[A](coll: IterableOnceOps[A, Any, Any]): Map[A, Int] =
+    def occurrences[A, CC[_], C](coll: IterableOnceOps[A, CC, C]): Map[A, Int] =
       coll.groupMapReduce(identity)(_ => 1)(_ + _)
 
     val xs = Seq('a', 'b', 'b', 'c', 'a', 'a', 'a', 'b')