Update the collections-contrib module to use 2.13.0-M4-pre-20d3c21.

julienrf · julienrf · commit 16f6150b32a9 · 2018-04-17T15:51:52.000+02:00
Also, update README and CONTRIBUTING files. This repository now only
hosts the code of the collections-contrib module and the scalafix
rewrite rules.
diff --git a/src/main/scala/scala/collection/MultiDict.scala b/src/main/scala/scala/collection/MultiDict.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 
 /**
   * A multidict is a map that can associate a set of values to a given key.
diff --git a/src/main/scala/scala/collection/MultiSet.scala b/src/main/scala/scala/collection/MultiSet.scala
@@ -1,5 +1,4 @@
-package strawman
-package collection
+package scala.collection
 
 /**
   * A multiset is a set that can contain multiple occurrences of a same value.
diff --git a/src/main/scala/scala/collection/SortedMultiDict.scala b/src/main/scala/scala/collection/SortedMultiDict.scala
@@ -1,8 +1,8 @@
-package strawman
-package collection
+package scala.collection
 
 /**
   * A multidict whose keys are sorted
+ *
   * @tparam K the type of keys
   * @tparam V the type of values
   */
diff --git a/src/main/scala/scala/collection/SortedMultiSet.scala b/src/main/scala/scala/collection/SortedMultiSet.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 
 import scala.annotation.unchecked.uncheckedVariance
 
@@ -15,7 +15,7 @@ trait SortedMultiSet[A]
   override protected[this] def fromSpecificIterable(coll: Iterable[A]): SortedIterableCC[A] = sortedIterableFactory.from(coll)
   override protected[this] def newSpecificBuilder(): mutable.Builder[A, SortedIterableCC[A]] = sortedIterableFactory.newBuilder[A]()
 
-  protected[this] def sortedFromIterable[B : Ordering](it: strawman.collection.Iterable[B]): SortedIterableCC[B] = sortedIterableFactory.from(it)
+  protected[this] def sortedFromIterable[B : Ordering](it: scala.collection.Iterable[B]): SortedIterableCC[B] = sortedIterableFactory.from(it)
 
   def sortedIterableFactory: SortedIterableFactory[SortedIterableCC] = SortedMultiSet
 }
diff --git a/src/main/scala/scala/collection/decorators/HasImmutableMapOps.scala b/src/main/scala/scala/collection/decorators/HasImmutableMapOps.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 /**
diff --git a/src/main/scala/scala/collection/decorators/HasIterableOps.scala b/src/main/scala/scala/collection/decorators/HasIterableOps.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 /**
diff --git a/src/main/scala/scala/collection/decorators/HasMapOps.scala b/src/main/scala/scala/collection/decorators/HasMapOps.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 /**
diff --git a/src/main/scala/scala/collection/decorators/HasSeqOps.scala b/src/main/scala/scala/collection/decorators/HasSeqOps.scala
@@ -1,9 +1,7 @@
-package strawman.collection
+package scala.collection
 package decorators
 
-import scala.{Array, Char, Int}
-import scala.Predef.String
-import strawman.collection.immutable.{ImmutableArray, Range}
+import scala.collection.immutable.{ImmutableArray, Range}
 
 /** Type class witnessing that a collection type `C` has
   * elements of type `A` and has a conversion to `SeqOps[A, _, _]`.
diff --git a/src/main/scala/scala/collection/decorators/ImmutableMapDecorator.scala b/src/main/scala/scala/collection/decorators/ImmutableMapDecorator.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package decorators
 
diff --git a/src/main/scala/scala/collection/decorators/IterableDecorator.scala b/src/main/scala/scala/collection/decorators/IterableDecorator.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package decorators
 
diff --git a/src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/src/main/scala/scala/collection/decorators/IteratorDecorator.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 import scala.annotation.tailrec
diff --git a/src/main/scala/scala/collection/decorators/MapDecorator.scala b/src/main/scala/scala/collection/decorators/MapDecorator.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 class MapDecorator[C, M <: HasMapOps[C]](coll: C)(implicit val map: M) {
diff --git a/src/main/scala/scala/collection/decorators/MutableMapDecorator.scala b/src/main/scala/scala/collection/decorators/MutableMapDecorator.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package decorators
 
diff --git a/src/main/scala/scala/collection/decorators/SeqDecorator.scala b/src/main/scala/scala/collection/decorators/SeqDecorator.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 /**
diff --git a/src/main/scala/scala/collection/decorators/package.scala b/src/main/scala/scala/collection/decorators/package.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 
 import scala.language.implicitConversions
 
diff --git a/src/main/scala/scala/collection/decorators/views.scala b/src/main/scala/scala/collection/decorators/views.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 /** Views used by decorators */
diff --git a/src/main/scala/scala/collection/immutable/MultiDict.scala b/src/main/scala/scala/collection/immutable/MultiDict.scala
@@ -1,9 +1,9 @@
-package strawman
+package scala
 package collection
 package immutable
 
 import collection.decorators._
-import strawman.collection.mutable.{Builder, ImmutableBuilder}
+import scala.collection.mutable.{Builder, ImmutableBuilder}
 
 /**
   * An immutable multidict
diff --git a/src/main/scala/scala/collection/immutable/MultiSet.scala b/src/main/scala/scala/collection/immutable/MultiSet.scala
@@ -1,10 +1,10 @@
-package strawman
+package scala
 package collection
 package immutable
 
-import strawman.collection.mutable.{Builder, ImmutableBuilder}
+import scala.collection.mutable.{Builder, ImmutableBuilder}
 
-import strawman.collection.decorators.ImmutableMapDecorator
+import scala.collection.decorators.ImmutableMapDecorator
 
 /**
   * An immutable multiset
diff --git a/src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/src/main/scala/scala/collection/immutable/SortedMultiDict.scala
@@ -1,9 +1,9 @@
-package strawman
+package scala
 package collection
 package immutable
 
-import collection.mutable.{Builder, ImmutableBuilder}
-import collection.decorators._
+import scala.collection.mutable.{Builder, ImmutableBuilder}
+import scala.collection.decorators._
 
 /**
   * An immutable multidict whose keys are sorted
diff --git a/src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/src/main/scala/scala/collection/immutable/SortedMultiSet.scala
@@ -1,9 +1,9 @@
-package strawman
+package scala
 package collection
 package immutable
 
-import strawman.collection.decorators.ImmutableMapDecorator
-import strawman.collection.mutable.{Builder, ImmutableBuilder}
+import scala.collection.decorators.ImmutableMapDecorator
+import scala.collection.mutable.{Builder, ImmutableBuilder}
 
 /**
   * An immutable multiset whose elements are sorted.
diff --git a/src/main/scala/scala/collection/mutable/MultiDict.scala b/src/main/scala/scala/collection/mutable/MultiDict.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package mutable
 
diff --git a/src/main/scala/scala/collection/mutable/MultiSet.scala b/src/main/scala/scala/collection/mutable/MultiSet.scala
@@ -1,8 +1,8 @@
-package strawman
+package scala
 package collection
 package mutable
 
-import strawman.collection.decorators.MutableMapDecorator
+import scala.collection.decorators.MutableMapDecorator
 
 /**
   * A mutable multiset.
diff --git a/src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/src/main/scala/scala/collection/mutable/SortedMultiDict.scala
@@ -1,8 +1,8 @@
-package strawman
+package scala
 package collection
 package mutable
 
-import collection.decorators._
+import scala.collection.decorators._
 
 /**
   * A mutable multidict whose keys are sorted
diff --git a/src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/src/main/scala/scala/collection/mutable/SortedMultiSet.scala
@@ -1,8 +1,8 @@
-package strawman
+package scala
 package collection
 package mutable
 
-import strawman.collection.decorators.MutableMapDecorator
+import scala.collection.decorators.MutableMapDecorator
 
 /**
   * A mutable multiset whose elements are sorted according to a given ordering.
diff --git a/src/test/scala/scala/collection/MultiMapTest.scala b/src/test/scala/scala/collection/MultiMapTest.scala
@@ -1,8 +1,8 @@
-package strawman.collection
+package scala.collection
 
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import strawman.collection.immutable.List
+import scala.collection.immutable.List
 import org.junit.{Assert, Test}
 
 @RunWith(classOf[JUnit4])
diff --git a/src/test/scala/scala/collection/MultiSetTest.scala b/src/test/scala/scala/collection/MultiSetTest.scala
@@ -1,8 +1,8 @@
-package strawman.collection
+package scala.collection
 
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import strawman.collection.immutable.List
+import scala.collection.immutable.List
 import org.junit.{Assert, Test}
 
 @RunWith(classOf[JUnit4])
diff --git a/src/test/scala/scala/collection/SortedMultiMapTest.scala b/src/test/scala/scala/collection/SortedMultiMapTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 
 
 import org.junit.{Assert, Test}
diff --git a/src/test/scala/scala/collection/SortedMultiSetTest.scala b/src/test/scala/scala/collection/SortedMultiSetTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 
 
 import org.junit.{Assert, Test}
diff --git a/src/test/scala/scala/collection/decorators/ImmutableMapDecoratorTest.scala b/src/test/scala/scala/collection/decorators/ImmutableMapDecoratorTest.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package decorators
 
diff --git a/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala
@@ -1,8 +1,8 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 import org.junit.{Assert, Test}
-import strawman.collection.immutable.{LazyList, List, Range, Map}
+import scala.collection.immutable.{LazyList, List, Range, Map}
 
 class IterableDecoratorTest {
 
diff --git a/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 import org.junit.{Assert, Test}
diff --git a/src/test/scala/scala/collection/decorators/MutableMapDecoratorTest.scala b/src/test/scala/scala/collection/decorators/MutableMapDecoratorTest.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package decorators
 
diff --git a/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala
@@ -1,11 +1,9 @@
-package strawman.collection
+package scala.collection
 package decorators
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import strawman.collection.immutable._
-
-import scala.Predef.{intArrayOps => _, genericArrayOps => _, wrapIntArray => _, genericWrapArray => _, $conforms}
+import scala.collection.immutable._
 
 class SeqDecoratorTest {
 
diff --git a/src/test/scala/scala/collection/immutable/MultiMapTest.scala b/src/test/scala/scala/collection/immutable/MultiMapTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.immutable
+package scala.collection.immutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
diff --git a/src/test/scala/scala/collection/immutable/MultiSetTest.scala b/src/test/scala/scala/collection/immutable/MultiSetTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.immutable
+package scala.collection.immutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
diff --git a/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.immutable
+package scala.collection.immutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
diff --git a/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.immutable
+package scala.collection.immutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
diff --git a/src/test/scala/scala/collection/mutable/MultiMapTest.scala b/src/test/scala/scala/collection/mutable/MultiMapTest.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package mutable
 
diff --git a/src/test/scala/scala/collection/mutable/MultiSetTest.scala b/src/test/scala/scala/collection/mutable/MultiSetTest.scala
@@ -1,4 +1,4 @@
-package strawman
+package scala
 package collection
 package mutable
 
diff --git a/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.mutable
+package scala.collection.mutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith
diff --git a/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala
@@ -1,4 +1,4 @@
-package strawman.collection.mutable
+package scala.collection.mutable
 
 import org.junit.{Assert, Test}
 import org.junit.runner.RunWith

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package strawman.collection`
	`1`	`+package scala.collection`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* A multidict is a map that can associate a set of values to a given key.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package strawman`
	`1`	`+package scala`
`2`	`2`	`package collection`
`3`	`3`	`package decorators`
`4`	`4`