Merge pull request #8005 from joshlemer/deprecate-multimap

dwijnand · web-flow · commit 2e9c248e5a63 · 2019-06-18T12:29:38.000+01:00
Deprecate scala.collection.mutable.MultiMap
diff --git a/src/library/scala/collection/mutable/MultiMap.scala b/src/library/scala/collection/mutable/MultiMap.scala
@@ -51,6 +51,7 @@ package scala.collection.mutable
   *  @define Coll `MultiMap`
   *  @since   1
   */
+@deprecated("Use a scala.collection.mutable.MultiDict in the scala-collection-contrib module", "2.13.0")
 trait MultiMap[K, V] extends Map[K, Set[V]] {
   /** Creates a new set.
     *
diff --git a/test/files/run/t2857.check b/test/files/run/t2857.check
@@ -1,2 +1,2 @@
-warning: there was one deprecation warning (since 2.13.0); re-run with -deprecation for details
+warning: there were two deprecation warnings (since 2.13.0); re-run with -deprecation for details
 false

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ package scala.collection.mutable`
`51`	`51`	* @define Coll `MultiMap`
`52`	`52`	`* @since 1`
`53`	`53`	`*/`
	`54`	`+@deprecated("Use a scala.collection.mutable.MultiDict in the scala-collection-contrib module", "2.13.0")`
`54`	`55`	`trait MultiMap[K, V] extends Map[K, Set[V]] {`
`55`	`56`	`/** Creates a new set.`
`56`	`57`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-warning: there was one deprecation warning (since 2.13.0); re-run with -deprecation for details`
	`1`	`+warning: there were two deprecation warnings (since 2.13.0); re-run with -deprecation for details`
`2`	`2`	`false`