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.

8 files changed, 26 insertions, 38 deletions

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/typetags_core.check
index d042e0900d..ec93221a30 100644
--- a/test/files/run/concretetypetags_core.check
+++ b/test/files/run/typetags_core.check
@@ -1,28 +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]

-true

-TypeTag[java.lang.String]

+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/concretetypetags_core.scala b/test/files/run/typetags_core.scala
index a870f77c5f..0d86fac25b 100644
--- a/test/files/run/concretetypetags_core.scala
+++ b/test/files/run/typetags_core.scala
@@ -27,6 +27,4 @@ object Test extends App {
   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/typetags_multi.check
index 6110252c36..6110252c36 100644
--- a/test/files/run/concretetypetags_multi.check
+++ b/test/files/run/typetags_multi.check
diff --git a/test/files/run/concretetypetags_multi.scala b/test/files/run/typetags_multi.scala
index b30aac80a6..b30aac80a6 100644
--- a/test/files/run/concretetypetags_multi.scala
+++ b/test/files/run/typetags_multi.scala