From 3becbd55aff0401f31fa6782c69c81b88befe39d Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Mon, 2 Jul 2012 13:21:20 +0200
Subject: removes ClassTag.String and TypeTag.String

TypeTag.String is removed because it's unclear whether it should point to
scala.Predef.String or to java.lang.String. ClassTag.String is removed to
be consistent with TypeTag.String.

This requires re-bootstrapping, because Definitions.scala in locker
expects classTag[String] being automatically generated, whereas starr
disagrees with locker on how to generate that class tag.
---
 test/files/run/abstypetags_core.check       |  2 --
 test/files/run/abstypetags_core.scala       |  2 --
 test/files/run/classtags_core.check         |  2 --
 test/files/run/classtags_core.scala         |  2 --
 test/files/run/concretetypetags_core.check  | 28 -------------------------
 test/files/run/concretetypetags_core.scala  | 32 -----------------------------
 test/files/run/concretetypetags_multi.check |  5 -----
 test/files/run/concretetypetags_multi.scala |  9 --------
 test/files/run/typetags_core.check          | 26 +++++++++++++++++++++++
 test/files/run/typetags_core.scala          | 30 +++++++++++++++++++++++++++
 test/files/run/typetags_multi.check         |  5 +++++
 test/files/run/typetags_multi.scala         |  9 ++++++++
 12 files changed, 70 insertions(+), 82 deletions(-)
 delete mode 100644 test/files/run/concretetypetags_core.check
 delete mode 100644 test/files/run/concretetypetags_core.scala
 delete mode 100644 test/files/run/concretetypetags_multi.check
 delete mode 100644 test/files/run/concretetypetags_multi.scala
 create mode 100644 test/files/run/typetags_core.check
 create mode 100644 test/files/run/typetags_core.scala
 create mode 100644 test/files/run/typetags_multi.check
 create mode 100644 test/files/run/typetags_multi.scala

(limited to 'test')

diff --git a/test/files/run/abstypetags_core.check b/test/files/run/abstypetags_core.check
index 55c8cb7e89..ec93221a30 100644
--- a/test/files/run/abstypetags_core.check
+++ b/test/files/run/abstypetags_core.check
@@ -24,5 +24,3 @@ true
 TypeTag[Null]
 true
 TypeTag[Nothing]
-true
-TypeTag[java.lang.String]
diff --git a/test/files/run/abstypetags_core.scala b/test/files/run/abstypetags_core.scala
index a49817f4d4..dbe9b5e11d 100644
--- a/test/files/run/abstypetags_core.scala
+++ b/test/files/run/abstypetags_core.scala
@@ -27,6 +27,4 @@ object Test extends App {
   println(implicitly[AbsTypeTag[Null]])
   println(implicitly[AbsTypeTag[Nothing]] eq AbsTypeTag.Nothing)
   println(implicitly[AbsTypeTag[Nothing]])
-  println(implicitly[AbsTypeTag[String]] eq AbsTypeTag.String)
-  println(implicitly[AbsTypeTag[String]])
 }
\ No newline at end of file
diff --git a/test/files/run/classtags_core.check b/test/files/run/classtags_core.check
index 7beada3f1c..ce7793e188 100644
--- a/test/files/run/classtags_core.check
+++ b/test/files/run/classtags_core.check
@@ -24,5 +24,3 @@ true
 ClassTag[class scala.runtime.Null$]
 true
 ClassTag[class scala.runtime.Nothing$]
-true
-ClassTag[class java.lang.String]
diff --git a/test/files/run/classtags_core.scala b/test/files/run/classtags_core.scala
index 17c69d9c41..ad5e12a8c2 100644
--- a/test/files/run/classtags_core.scala
+++ b/test/files/run/classtags_core.scala
@@ -27,6 +27,4 @@ object Test extends App {
   println(implicitly[ClassTag[Null]])
   println(implicitly[ClassTag[Nothing]] eq ClassTag.Nothing)
   println(implicitly[ClassTag[Nothing]])
-  println(implicitly[ClassTag[String]] eq ClassTag.String)
-  println(implicitly[ClassTag[String]])
 }
\ No newline at end of file
diff --git a/test/files/run/concretetypetags_core.check b/test/files/run/concretetypetags_core.check
deleted file mode 100644
index d042e0900d..0000000000
--- a/test/files/run/concretetypetags_core.check
+++ /dev/null
@@ -1,28 +0,0 @@
-true
-TypeTag[Byte]
-true
-TypeTag[Short]
-true
-TypeTag[Char]
-true
-TypeTag[Int]
-true
-TypeTag[Long]
-true
-TypeTag[Float]
-true
-TypeTag[Double]
-true
-TypeTag[Boolean]
-true
-TypeTag[Unit]
-true
-TypeTag[Any]
-true
-TypeTag[java.lang.Object]
-true
-TypeTag[Null]
-true
-TypeTag[Nothing]
-true
-TypeTag[java.lang.String]
diff --git a/test/files/run/concretetypetags_core.scala b/test/files/run/concretetypetags_core.scala
deleted file mode 100644
index a870f77c5f..0000000000
--- a/test/files/run/concretetypetags_core.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-import scala.reflect.runtime.universe._
-
-object Test extends App {
-  println(implicitly[TypeTag[Byte]] eq TypeTag.Byte)
-  println(implicitly[TypeTag[Byte]])
-  println(implicitly[TypeTag[Short]] eq TypeTag.Short)
-  println(implicitly[TypeTag[Short]])
-  println(implicitly[TypeTag[Char]] eq TypeTag.Char)
-  println(implicitly[TypeTag[Char]])
-  println(implicitly[TypeTag[Int]] eq TypeTag.Int)
-  println(implicitly[TypeTag[Int]])
-  println(implicitly[TypeTag[Long]] eq TypeTag.Long)
-  println(implicitly[TypeTag[Long]])
-  println(implicitly[TypeTag[Float]] eq TypeTag.Float)
-  println(implicitly[TypeTag[Float]])
-  println(implicitly[TypeTag[Double]] eq TypeTag.Double)
-  println(implicitly[TypeTag[Double]])
-  println(implicitly[TypeTag[Boolean]] eq TypeTag.Boolean)
-  println(implicitly[TypeTag[Boolean]])
-  println(implicitly[TypeTag[Unit]] eq TypeTag.Unit)
-  println(implicitly[TypeTag[Unit]])
-  println(implicitly[TypeTag[Any]] eq TypeTag.Any)
-  println(implicitly[TypeTag[Any]])
-  println(implicitly[TypeTag[Object]] eq TypeTag.Object)
-  println(implicitly[TypeTag[Object]])
-  println(implicitly[TypeTag[Null]] eq TypeTag.Null)
-  println(implicitly[TypeTag[Null]])
-  println(implicitly[TypeTag[Nothing]] eq TypeTag.Nothing)
-  println(implicitly[TypeTag[Nothing]])
-  println(implicitly[TypeTag[String]] eq TypeTag.String)
-  println(implicitly[TypeTag[String]])
-}
\ No newline at end of file
diff --git a/test/files/run/concretetypetags_multi.check b/test/files/run/concretetypetags_multi.check
deleted file mode 100644
index 6110252c36..0000000000
--- a/test/files/run/concretetypetags_multi.check
+++ /dev/null
@@ -1,5 +0,0 @@
-TypeTag[Int]
-TypeTag[Array[Int]]
-TypeTag[Array[Array[Int]]]
-TypeTag[Array[Array[Array[Int]]]]
-TypeTag[Array[Array[Array[Array[Int]]]]]
diff --git a/test/files/run/concretetypetags_multi.scala b/test/files/run/concretetypetags_multi.scala
deleted file mode 100644
index b30aac80a6..0000000000
--- a/test/files/run/concretetypetags_multi.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import scala.reflect.runtime.universe._
-
-object Test extends App {
-  println(implicitly[TypeTag[Int]])
-  println(implicitly[TypeTag[Array[Int]]])
-  println(implicitly[TypeTag[Array[Array[Int]]]])
-  println(implicitly[TypeTag[Array[Array[Array[Int]]]]])
-  println(implicitly[TypeTag[Array[Array[Array[Array[Int]]]]]])
-}
\ No newline at end of file
diff --git a/test/files/run/typetags_core.check b/test/files/run/typetags_core.check
new file mode 100644
index 0000000000..ec93221a30
--- /dev/null
+++ b/test/files/run/typetags_core.check
@@ -0,0 +1,26 @@
+true
+TypeTag[Byte]
+true
+TypeTag[Short]
+true
+TypeTag[Char]
+true
+TypeTag[Int]
+true
+TypeTag[Long]
+true
+TypeTag[Float]
+true
+TypeTag[Double]
+true
+TypeTag[Boolean]
+true
+TypeTag[Unit]
+true
+TypeTag[Any]
+true
+TypeTag[java.lang.Object]
+true
+TypeTag[Null]
+true
+TypeTag[Nothing]
diff --git a/test/files/run/typetags_core.scala b/test/files/run/typetags_core.scala
new file mode 100644
index 0000000000..0d86fac25b
--- /dev/null
+++ b/test/files/run/typetags_core.scala
@@ -0,0 +1,30 @@
+import scala.reflect.runtime.universe._
+
+object Test extends App {
+  println(implicitly[TypeTag[Byte]] eq TypeTag.Byte)
+  println(implicitly[TypeTag[Byte]])
+  println(implicitly[TypeTag[Short]] eq TypeTag.Short)
+  println(implicitly[TypeTag[Short]])
+  println(implicitly[TypeTag[Char]] eq TypeTag.Char)
+  println(implicitly[TypeTag[Char]])
+  println(implicitly[TypeTag[Int]] eq TypeTag.Int)
+  println(implicitly[TypeTag[Int]])
+  println(implicitly[TypeTag[Long]] eq TypeTag.Long)
+  println(implicitly[TypeTag[Long]])
+  println(implicitly[TypeTag[Float]] eq TypeTag.Float)
+  println(implicitly[TypeTag[Float]])
+  println(implicitly[TypeTag[Double]] eq TypeTag.Double)
+  println(implicitly[TypeTag[Double]])
+  println(implicitly[TypeTag[Boolean]] eq TypeTag.Boolean)
+  println(implicitly[TypeTag[Boolean]])
+  println(implicitly[TypeTag[Unit]] eq TypeTag.Unit)
+  println(implicitly[TypeTag[Unit]])
+  println(implicitly[TypeTag[Any]] eq TypeTag.Any)
+  println(implicitly[TypeTag[Any]])
+  println(implicitly[TypeTag[Object]] eq TypeTag.Object)
+  println(implicitly[TypeTag[Object]])
+  println(implicitly[TypeTag[Null]] eq TypeTag.Null)
+  println(implicitly[TypeTag[Null]])
+  println(implicitly[TypeTag[Nothing]] eq TypeTag.Nothing)
+  println(implicitly[TypeTag[Nothing]])
+}
\ No newline at end of file
diff --git a/test/files/run/typetags_multi.check b/test/files/run/typetags_multi.check
new file mode 100644
index 0000000000..6110252c36
--- /dev/null
+++ b/test/files/run/typetags_multi.check
@@ -0,0 +1,5 @@
+TypeTag[Int]
+TypeTag[Array[Int]]
+TypeTag[Array[Array[Int]]]
+TypeTag[Array[Array[Array[Int]]]]
+TypeTag[Array[Array[Array[Array[Int]]]]]
diff --git a/test/files/run/typetags_multi.scala b/test/files/run/typetags_multi.scala
new file mode 100644
index 0000000000..b30aac80a6
--- /dev/null
+++ b/test/files/run/typetags_multi.scala
@@ -0,0 +1,9 @@
+import scala.reflect.runtime.universe._
+
+object Test extends App {
+  println(implicitly[TypeTag[Int]])
+  println(implicitly[TypeTag[Array[Int]]])
+  println(implicitly[TypeTag[Array[Array[Int]]]])
+  println(implicitly[TypeTag[Array[Array[Array[Int]]]]])
+  println(implicitly[TypeTag[Array[Array[Array[Array[Int]]]]]])
+}
\ No newline at end of file
-- 
cgit v1.2.3