fixup! Update compat/src/test/scala/test/scala/collection/CollectionTest.scala

move converversion method to package objects

Author: NthPortal

compat/src/main/scala-2.11/scala/collection/compat/package.scala

@@ -12,4 +12,12 @@
 
 package scala.collection
 
-package object compat extends compat.PackageShared
+import scala.collection.generic.{CanBuildFrom, GenericOrderedCompanion}
+
+package object compat extends compat.PackageShared {
+  implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
+      fact: GenericOrderedCompanion[CC])(
+      implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] = {
+    CompatImpl.simpleCBF(fact.newBuilder[A])
+  }
+}

compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala

@@ -55,11 +55,6 @@ private[compat] trait PackageShared {
     simpleCBF(builder)
   }
 
-  implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
-      fact: GenericOrderedCompanion[CC])(implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] = {
-    simpleCBF(fact.newBuilder[A])
-  }
-
   implicit def sortedSetCompanionToCBF[A: Ordering,
                                        CC[X] <: c.SortedSet[X] with c.SortedSetLike[X, CC[X]]](
       fact: SortedSetFactory[CC]): CanBuildFrom[Any, A, CC[A]] =

compat/src/main/scala-2.12/scala/collection/compat/package.scala

@@ -12,6 +12,7 @@
 
 package scala.collection
 
+import scala.collection.generic.{CanBuildFrom, GenericOrderedCompanion}
 import scala.collection.{mutable => m}
 
 package object compat extends compat.PackageShared {
@@ -24,4 +25,10 @@ package object compat extends compat.PackageShared {
     def from[K: Ordering, V](source: TraversableOnce[(K, V)]): m.SortedMap[K, V] =
       build(m.SortedMap.newBuilder[K, V], source)
   }
+
+  implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
+      fact: GenericOrderedCompanion[CC])(
+      implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] = {
+    CompatImpl.simpleCBF(fact.newBuilder[A])
+  }
 }