Merge pull request #1900 from paulp/pr/maybe-rewrap-less

Modifies "maybeRewrap" to focus more on the maybe.

4 files changed, 57 insertions, 10 deletions

diff --git a/test/files/run/t6329_repl.check b/test/files/run/t6329_repl.check
index 8663184bde..55d689f2fb 100644
--- a/test/files/run/t6329_repl.check
+++ b/test/files/run/t6329_repl.check
@@ -3,11 +3,37 @@ Type :help for more information.
 
 scala> 
 
-scala> classManifest[List[_]]
+scala> import scala.reflect.classTag
+import scala.reflect.classTag
+
+scala> classManifest[scala.List[_]]
 warning: there were 1 deprecation warnings; re-run with -deprecation for details
-res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any]
+res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[<?>]
 
-scala> scala.reflect.classTag[List[_]]
+scala> classTag[scala.List[_]]
 res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List
 
+scala> classManifest[scala.collection.immutable.List[_]]
+warning: there were 1 deprecation warnings; re-run with -deprecation for details
+res2: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[<?>]
+
+scala> classTag[scala.collection.immutable.List[_]]
+res3: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List
+
+scala> classManifest[Predef.Set[_]]
+warning: there were 1 deprecation warnings; re-run with -deprecation for details
+res4: scala.reflect.ClassTag[scala.collection.immutable.Set[_]] = scala.collection.immutable.Set[<?>]
+
+scala> classTag[Predef.Set[_]]
+res5: scala.reflect.ClassTag[scala.collection.immutable.Set[_]] = scala.collection.immutable.Set
+
+scala> classManifest[scala.collection.immutable.Set[_]]
+warning: there were 1 deprecation warnings; re-run with -deprecation for details
+res6: scala.reflect.ClassTag[scala.collection.immutable.Set[_]] = scala.collection.immutable.Set[<?>]
+
+scala> classTag[scala.collection.immutable.Set[_]]
+res7: scala.reflect.ClassTag[scala.collection.immutable.Set[_]] = scala.collection.immutable.Set
+
+scala> 
+
 scala> 
diff --git a/test/files/run/t6329_repl.scala b/test/files/run/t6329_repl.scala
index add6d64962..f210d6512c 100644
--- a/test/files/run/t6329_repl.scala
+++ b/test/files/run/t6329_repl.scala
@@ -2,7 +2,14 @@ import scala.tools.partest.ReplTest
 
 object Test extends ReplTest {
   def code = """
-    |classManifest[List[_]]
-    |scala.reflect.classTag[List[_]]
-    |""".stripMargin
+    |import scala.reflect.classTag
+    |classManifest[scala.List[_]]
+    |classTag[scala.List[_]]
+    |classManifest[scala.collection.immutable.List[_]]
+    |classTag[scala.collection.immutable.List[_]]
+    |classManifest[Predef.Set[_]]
+    |classTag[Predef.Set[_]]
+    |classManifest[scala.collection.immutable.Set[_]]
+    |classTag[scala.collection.immutable.Set[_]]
+  """.stripMargin
 }
diff --git a/test/files/run/t6329_vanilla.check b/test/files/run/t6329_vanilla.check
index 8282afaeba..ad8f4b5c77 100644
--- a/test/files/run/t6329_vanilla.check
+++ b/test/files/run/t6329_vanilla.check
@@ -1,2 +1,8 @@
-scala.collection.immutable.List[Any]
+scala.collection.immutable.List[<?>]
 scala.collection.immutable.List
+scala.collection.immutable.List[<?>]
+scala.collection.immutable.List
+scala.collection.immutable.Set[<?>]
+scala.collection.immutable.Set
+scala.collection.immutable.Set[<?>]
+scala.collection.immutable.Set
diff --git a/test/files/run/t6329_vanilla.scala b/test/files/run/t6329_vanilla.scala
index a31cd5c72e..f2d843896d 100644
--- a/test/files/run/t6329_vanilla.scala
+++ b/test/files/run/t6329_vanilla.scala
@@ -1,4 +1,12 @@
+import scala.reflect.classTag
+
 object Test extends App {
-  println(classManifest[List[_]])
-  println(scala.reflect.classTag[List[_]])
-}
\ No newline at end of file
+  println(classManifest[scala.List[_]])
+  println(classTag[scala.List[_]])
+  println(classManifest[scala.collection.immutable.List[_]])
+  println(classTag[scala.collection.immutable.List[_]])
+  println(classManifest[Predef.Set[_]])
+  println(classTag[Predef.Set[_]])
+  println(classManifest[scala.collection.immutable.Set[_]])
+  println(classTag[scala.collection.immutable.Set[_]])
+}