GroundTypeTag => ConcreteTypeTag

36 files changed, 131 insertions, 131 deletions

diff --git a/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags.check b/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags.check
index d9c390ba25..39e90f827e 100644
--- a/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags.check
+++ b/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags.check
@@ -1,7 +1,7 @@
-Test.scala:5: error: No GroundTypeTag available for C[T]

-    println(implicitly[GroundTypeTag[C[T]]])

+Test.scala:5: error: No ConcreteTypeTag available for C[T]

+    println(implicitly[ConcreteTypeTag[C[T]]])

                       ^

-Test.scala:6: error: No GroundTypeTag available for List[C[T]]

-    println(implicitly[GroundTypeTag[List[C[T]]]])

+Test.scala:6: error: No ConcreteTypeTag available for List[C[T]]

+    println(implicitly[ConcreteTypeTag[List[C[T]]]])

                       ^

 two errors found

diff --git a/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags/Test.scala b/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags/Test.scala
index d5ee61b91d..1302999da6 100644
--- a/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags/Test.scala
+++ b/test/files/neg/macro-reify-groundtypetag-hktypeparams-notags/Test.scala
@@ -2,8 +2,8 @@ import scala.reflect.mirror._
 
 object Test extends App {
   def fooNoTypeTagHK[C[_], T] = {
-    println(implicitly[GroundTypeTag[C[T]]])
-    println(implicitly[GroundTypeTag[List[C[T]]]])
+    println(implicitly[ConcreteTypeTag[C[T]]])
+    println(implicitly[ConcreteTypeTag[List[C[T]]]])
   }
   fooNoTypeTagHK[List, Int]
 }
\ No newline at end of file
diff --git a/test/files/neg/macro-reify-groundtypetag-typeparams-notags.check b/test/files/neg/macro-reify-groundtypetag-typeparams-notags.check
index c678a2a313..164ca3543f 100644
--- a/test/files/neg/macro-reify-groundtypetag-typeparams-notags.check
+++ b/test/files/neg/macro-reify-groundtypetag-typeparams-notags.check
@@ -1,7 +1,7 @@
-Test.scala:5: error: No GroundTypeTag available for T

-    println(implicitly[GroundTypeTag[T]])

+Test.scala:5: error: No ConcreteTypeTag available for T

+    println(implicitly[ConcreteTypeTag[T]])

                       ^

-Test.scala:6: error: No GroundTypeTag available for List[T]

-    println(implicitly[GroundTypeTag[List[T]]])

+Test.scala:6: error: No ConcreteTypeTag available for List[T]

+    println(implicitly[ConcreteTypeTag[List[T]]])

                       ^

 two errors found

diff --git a/test/files/neg/macro-reify-groundtypetag-typeparams-notags/Test.scala b/test/files/neg/macro-reify-groundtypetag-typeparams-notags/Test.scala
index 98bdf6d67f..d2276ce333 100644
--- a/test/files/neg/macro-reify-groundtypetag-typeparams-notags/Test.scala
+++ b/test/files/neg/macro-reify-groundtypetag-typeparams-notags/Test.scala
@@ -2,8 +2,8 @@ import scala.reflect.mirror._
 
 object Test extends App {
   def fooNoTypeTag[T] = {
-    println(implicitly[GroundTypeTag[T]])
-    println(implicitly[GroundTypeTag[List[T]]])
+    println(implicitly[ConcreteTypeTag[T]])
+    println(implicitly[ConcreteTypeTag[List[T]]])
   }
   fooNoTypeTag[Int]
 }
\ No newline at end of file
diff --git a/test/files/neg/macro-reify-groundtypetag-usetypetag.check b/test/files/neg/macro-reify-groundtypetag-usetypetag.check
index c678a2a313..164ca3543f 100644
--- a/test/files/neg/macro-reify-groundtypetag-usetypetag.check
+++ b/test/files/neg/macro-reify-groundtypetag-usetypetag.check
@@ -1,7 +1,7 @@
-Test.scala:5: error: No GroundTypeTag available for T

-    println(implicitly[GroundTypeTag[T]])

+Test.scala:5: error: No ConcreteTypeTag available for T

+    println(implicitly[ConcreteTypeTag[T]])

                       ^

-Test.scala:6: error: No GroundTypeTag available for List[T]

-    println(implicitly[GroundTypeTag[List[T]]])

+Test.scala:6: error: No ConcreteTypeTag available for List[T]

+    println(implicitly[ConcreteTypeTag[List[T]]])

                       ^

 two errors found

diff --git a/test/files/neg/macro-reify-groundtypetag-usetypetag/Test.scala b/test/files/neg/macro-reify-groundtypetag-usetypetag/Test.scala
index 507d03a390..d82cdc33e9 100644
--- a/test/files/neg/macro-reify-groundtypetag-usetypetag/Test.scala
+++ b/test/files/neg/macro-reify-groundtypetag-usetypetag/Test.scala
@@ -2,8 +2,8 @@ import scala.reflect.mirror._
 
 object Test extends App {
   def fooTypeTag[T: TypeTag] = {
-    println(implicitly[GroundTypeTag[T]])
-    println(implicitly[GroundTypeTag[List[T]]])
+    println(implicitly[ConcreteTypeTag[T]])
+    println(implicitly[ConcreteTypeTag[List[T]]])
   }
   fooTypeTag[Int]
 }
\ No newline at end of file
diff --git a/test/files/neg/t3507.check b/test/files/neg/t3507.check
index 6b6df6ba76..71bf295039 100644
--- a/test/files/neg/t3507.check
+++ b/test/files/neg/t3507.check
@@ -1,4 +1,4 @@
-t3507.scala:13: error: No GroundTypeTag available for _1.b.c.type

+t3507.scala:13: error: No ConcreteTypeTag available for _1.b.c.type

   mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier

                          ^

 one error found

diff --git a/test/files/neg/t3692.check b/test/files/neg/t3692.check
index ec67e76bb4..d83abd31e2 100644
--- a/test/files/neg/t3692.check
+++ b/test/files/neg/t3692.check
@@ -1,7 +1,7 @@
-t3692.scala:11: warning: type Manifest in object Predef is deprecated: Use `@scala.reflect.GroundTypeTag` instead

+t3692.scala:11: warning: type Manifest in object Predef is deprecated: Use `@scala.reflect.ConcreteTypeTag` instead

   private final def toJavaMap[T, V](map: Map[T, V])(implicit m1: Manifest[T], m2: Manifest[V]): java.util.Map[_, _] = {

                                                                  ^

-t3692.scala:11: warning: type Manifest in object Predef is deprecated: Use `@scala.reflect.GroundTypeTag` instead

+t3692.scala:11: warning: type Manifest in object Predef is deprecated: Use `@scala.reflect.ConcreteTypeTag` instead

   private final def toJavaMap[T, V](map: Map[T, V])(implicit m1: Manifest[T], m2: Manifest[V]): java.util.Map[_, _] = {

                                                                                   ^

 t3692.scala:15: error: unreachable code

diff --git a/test/files/run/groundtypetags_core.check b/test/files/run/groundtypetags_core.check
index d1b71f0926..62fcb481ae 100644
--- a/test/files/run/groundtypetags_core.check
+++ b/test/files/run/groundtypetags_core.check
@@ -1,30 +1,30 @@
 true

-GroundTypeTag[Byte]

+ConcreteTypeTag[Byte]

 true

-GroundTypeTag[Short]

+ConcreteTypeTag[Short]

 true

-GroundTypeTag[Char]

+ConcreteTypeTag[Char]

 true

-GroundTypeTag[Int]

+ConcreteTypeTag[Int]

 true

-GroundTypeTag[Long]

+ConcreteTypeTag[Long]

 true

-GroundTypeTag[Float]

+ConcreteTypeTag[Float]

 true

-GroundTypeTag[Double]

+ConcreteTypeTag[Double]

 true

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Boolean]

 true

-GroundTypeTag[Unit]

+ConcreteTypeTag[Unit]

 true

-GroundTypeTag[Any]

+ConcreteTypeTag[Any]

 true

-GroundTypeTag[Object]

+ConcreteTypeTag[Object]

 true

-GroundTypeTag[AnyVal]

+ConcreteTypeTag[AnyVal]

 true

-GroundTypeTag[AnyRef]

+ConcreteTypeTag[AnyRef]

 true

-GroundTypeTag[Null]

+ConcreteTypeTag[Null]

 true

-GroundTypeTag[Nothing]

+ConcreteTypeTag[Nothing]

diff --git a/test/files/run/groundtypetags_core.scala b/test/files/run/groundtypetags_core.scala
index d779e3fc7e..8b81a0c795 100644
--- a/test/files/run/groundtypetags_core.scala
+++ b/test/files/run/groundtypetags_core.scala
@@ -1,32 +1,32 @@
 object Test extends App {
-  println(implicitly[GroundTypeTag[Byte]] eq GroundTypeTag.Byte)
-  println(implicitly[GroundTypeTag[Byte]])
-  println(implicitly[GroundTypeTag[Short]] eq GroundTypeTag.Short)
-  println(implicitly[GroundTypeTag[Short]])
-  println(implicitly[GroundTypeTag[Char]] eq GroundTypeTag.Char)
-  println(implicitly[GroundTypeTag[Char]])
-  println(implicitly[GroundTypeTag[Int]] eq GroundTypeTag.Int)
-  println(implicitly[GroundTypeTag[Int]])
-  println(implicitly[GroundTypeTag[Long]] eq GroundTypeTag.Long)
-  println(implicitly[GroundTypeTag[Long]])
-  println(implicitly[GroundTypeTag[Float]] eq GroundTypeTag.Float)
-  println(implicitly[GroundTypeTag[Float]])
-  println(implicitly[GroundTypeTag[Double]] eq GroundTypeTag.Double)
-  println(implicitly[GroundTypeTag[Double]])
-  println(implicitly[GroundTypeTag[Boolean]] eq GroundTypeTag.Boolean)
-  println(implicitly[GroundTypeTag[Boolean]])
-  println(implicitly[GroundTypeTag[Unit]] eq GroundTypeTag.Unit)
-  println(implicitly[GroundTypeTag[Unit]])
-  println(implicitly[GroundTypeTag[Any]] eq GroundTypeTag.Any)
-  println(implicitly[GroundTypeTag[Any]])
-  println(implicitly[GroundTypeTag[Object]] eq GroundTypeTag.Object)
-  println(implicitly[GroundTypeTag[Object]])
-  println(implicitly[GroundTypeTag[AnyVal]] eq GroundTypeTag.AnyVal)
-  println(implicitly[GroundTypeTag[AnyVal]])
-  println(implicitly[GroundTypeTag[AnyRef]] eq GroundTypeTag.AnyRef)
-  println(implicitly[GroundTypeTag[AnyRef]])
-  println(implicitly[GroundTypeTag[Null]] eq GroundTypeTag.Null)
-  println(implicitly[GroundTypeTag[Null]])
-  println(implicitly[GroundTypeTag[Nothing]] eq GroundTypeTag.Nothing)
-  println(implicitly[GroundTypeTag[Nothing]])
+  println(implicitly[ConcreteTypeTag[Byte]] eq ConcreteTypeTag.Byte)
+  println(implicitly[ConcreteTypeTag[Byte]])
+  println(implicitly[ConcreteTypeTag[Short]] eq ConcreteTypeTag.Short)
+  println(implicitly[ConcreteTypeTag[Short]])
+  println(implicitly[ConcreteTypeTag[Char]] eq ConcreteTypeTag.Char)
+  println(implicitly[ConcreteTypeTag[Char]])
+  println(implicitly[ConcreteTypeTag[Int]] eq ConcreteTypeTag.Int)
+  println(implicitly[ConcreteTypeTag[Int]])
+  println(implicitly[ConcreteTypeTag[Long]] eq ConcreteTypeTag.Long)
+  println(implicitly[ConcreteTypeTag[Long]])
+  println(implicitly[ConcreteTypeTag[Float]] eq ConcreteTypeTag.Float)
+  println(implicitly[ConcreteTypeTag[Float]])
+  println(implicitly[ConcreteTypeTag[Double]] eq ConcreteTypeTag.Double)
+  println(implicitly[ConcreteTypeTag[Double]])
+  println(implicitly[ConcreteTypeTag[Boolean]] eq ConcreteTypeTag.Boolean)
+  println(implicitly[ConcreteTypeTag[Boolean]])
+  println(implicitly[ConcreteTypeTag[Unit]] eq ConcreteTypeTag.Unit)
+  println(implicitly[ConcreteTypeTag[Unit]])
+  println(implicitly[ConcreteTypeTag[Any]] eq ConcreteTypeTag.Any)
+  println(implicitly[ConcreteTypeTag[Any]])
+  println(implicitly[ConcreteTypeTag[Object]] eq ConcreteTypeTag.Object)
+  println(implicitly[ConcreteTypeTag[Object]])
+  println(implicitly[ConcreteTypeTag[AnyVal]] eq ConcreteTypeTag.AnyVal)
+  println(implicitly[ConcreteTypeTag[AnyVal]])
+  println(implicitly[ConcreteTypeTag[AnyRef]] eq ConcreteTypeTag.AnyRef)
+  println(implicitly[ConcreteTypeTag[AnyRef]])
+  println(implicitly[ConcreteTypeTag[Null]] eq ConcreteTypeTag.Null)
+  println(implicitly[ConcreteTypeTag[Null]])
+  println(implicitly[ConcreteTypeTag[Nothing]] eq ConcreteTypeTag.Nothing)
+  println(implicitly[ConcreteTypeTag[Nothing]])
 }
\ No newline at end of file
diff --git a/test/files/run/macro-expand-nullary-generic.check b/test/files/run/macro-expand-nullary-generic.check
index 34a453cd3a..6dfe04af12 100644
--- a/test/files/run/macro-expand-nullary-generic.check
+++ b/test/files/run/macro-expand-nullary-generic.check
@@ -1,6 +1,6 @@
-it works GroundTypeTag[Int]

-it works GroundTypeTag[Int]

-it works GroundTypeTag[Int]

-it works GroundTypeTag[Int]

-it works GroundTypeTag[Int]

+it works ConcreteTypeTag[Int]

+it works ConcreteTypeTag[Int]

+it works ConcreteTypeTag[Int]

+it works ConcreteTypeTag[Int]

+it works ConcreteTypeTag[Int]

 kkthxbai

diff --git a/test/files/run/macro-expand-tparams-explicit.check b/test/files/run/macro-expand-tparams-explicit.check
index 54da026aa8..5670e27c4e 100644
--- a/test/files/run/macro-expand-tparams-explicit.check
+++ b/test/files/run/macro-expand-tparams-explicit.check
@@ -1 +1 @@
-GroundTypeTag[Int]

+ConcreteTypeTag[Int]

diff --git a/test/files/run/macro-expand-tparams-implicit.check b/test/files/run/macro-expand-tparams-implicit.check
index 60c021a35b..e57fc1217b 100644
--- a/test/files/run/macro-expand-tparams-implicit.check
+++ b/test/files/run/macro-expand-tparams-implicit.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[String]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[String]

diff --git a/test/files/run/macro-expand-tparams-prefix-a.check b/test/files/run/macro-expand-tparams-prefix-a.check
index 1447c2478f..922be1a6dd 100644
--- a/test/files/run/macro-expand-tparams-prefix-a.check
+++ b/test/files/run/macro-expand-tparams-prefix-a.check
@@ -1,4 +1,4 @@
-GroundTypeTag[Int]

-GroundTypeTag[Int]

-GroundTypeTag[String]

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[String]

+ConcreteTypeTag[Boolean]

diff --git a/test/files/run/macro-expand-tparams-prefix-b.check b/test/files/run/macro-expand-tparams-prefix-b.check
index c7ec594b92..a336bb51ec 100644
--- a/test/files/run/macro-expand-tparams-prefix-b.check
+++ b/test/files/run/macro-expand-tparams-prefix-b.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Boolean] GroundTypeTag[Int]

-GroundTypeTag[Boolean] GroundTypeTag[String]

+ConcreteTypeTag[Boolean] ConcreteTypeTag[Int]

+ConcreteTypeTag[Boolean] ConcreteTypeTag[String]

diff --git a/test/files/run/macro-expand-tparams-prefix-c1.check b/test/files/run/macro-expand-tparams-prefix-c1.check
index fac58e9516..87f295aa49 100644
--- a/test/files/run/macro-expand-tparams-prefix-c1.check
+++ b/test/files/run/macro-expand-tparams-prefix-c1.check
@@ -1,3 +1,3 @@
-GroundTypeTag[Int]

-GroundTypeTag[String]

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[String]

+ConcreteTypeTag[Boolean]

diff --git a/test/files/run/macro-expand-tparams-prefix-c2.check b/test/files/run/macro-expand-tparams-prefix-c2.check
index fac58e9516..87f295aa49 100644
--- a/test/files/run/macro-expand-tparams-prefix-c2.check
+++ b/test/files/run/macro-expand-tparams-prefix-c2.check
@@ -1,3 +1,3 @@
-GroundTypeTag[Int]

-GroundTypeTag[String]

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[String]

+ConcreteTypeTag[Boolean]

diff --git a/test/files/run/macro-expand-tparams-prefix-d1.check b/test/files/run/macro-expand-tparams-prefix-d1.check
index f78ddea4f3..ca7a220475 100644
--- a/test/files/run/macro-expand-tparams-prefix-d1.check
+++ b/test/files/run/macro-expand-tparams-prefix-d1.check
@@ -1,3 +1,3 @@
 TypeTag[T]

 TypeTag[U]

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Boolean]

diff --git a/test/files/run/macro-reify-groundtypetag-notypeparams.check b/test/files/run/macro-reify-groundtypetag-notypeparams.check
index 24612cd4b7..d75b3c72b2 100644
--- a/test/files/run/macro-reify-groundtypetag-notypeparams.check
+++ b/test/files/run/macro-reify-groundtypetag-notypeparams.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[List[Int]]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[List[Int]]

diff --git a/test/files/run/macro-reify-groundtypetag-notypeparams/Test.scala b/test/files/run/macro-reify-groundtypetag-notypeparams/Test.scala
index 3aa40251ec..d2f8fab5ec 100644
--- a/test/files/run/macro-reify-groundtypetag-notypeparams/Test.scala
+++ b/test/files/run/macro-reify-groundtypetag-notypeparams/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.mirror._
 
 object Test extends App {
-  println(implicitly[GroundTypeTag[Int]])
-  println(implicitly[GroundTypeTag[List[Int]]])
+  println(implicitly[ConcreteTypeTag[Int]])
+  println(implicitly[ConcreteTypeTag[List[Int]]])
 }
\ No newline at end of file
diff --git a/test/files/run/macro-reify-groundtypetag-typeparams-tags.check b/test/files/run/macro-reify-groundtypetag-typeparams-tags.check
index 24612cd4b7..d75b3c72b2 100644
--- a/test/files/run/macro-reify-groundtypetag-typeparams-tags.check
+++ b/test/files/run/macro-reify-groundtypetag-typeparams-tags.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[List[Int]]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[List[Int]]

diff --git a/test/files/run/macro-reify-groundtypetag-typeparams-tags/Test.scala b/test/files/run/macro-reify-groundtypetag-typeparams-tags/Test.scala
index 21735c10d5..6d7eab5f9a 100644
--- a/test/files/run/macro-reify-groundtypetag-typeparams-tags/Test.scala
+++ b/test/files/run/macro-reify-groundtypetag-typeparams-tags/Test.scala
@@ -1,9 +1,9 @@
 import scala.reflect.mirror._
 
 object Test extends App {
-  def fooTypeTag[T: GroundTypeTag] = {
-    println(implicitly[GroundTypeTag[T]])
-    println(implicitly[GroundTypeTag[List[T]]])
+  def fooTypeTag[T: ConcreteTypeTag] = {
+    println(implicitly[ConcreteTypeTag[T]])
+    println(implicitly[ConcreteTypeTag[List[T]]])
   }
   fooTypeTag[Int]
 }
\ No newline at end of file
diff --git a/test/files/run/macro-reify-typetag-notypeparams.check b/test/files/run/macro-reify-typetag-notypeparams.check
index 24612cd4b7..d75b3c72b2 100644
--- a/test/files/run/macro-reify-typetag-notypeparams.check
+++ b/test/files/run/macro-reify-typetag-notypeparams.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[List[Int]]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[List[Int]]

diff --git a/test/files/run/macro-reify-typetag-typeparams-notags.check b/test/files/run/macro-reify-typetag-typeparams-notags.check
index 3da30c71ba..af4877e205 100644
--- a/test/files/run/macro-reify-typetag-typeparams-notags.check
+++ b/test/files/run/macro-reify-typetag-typeparams-notags.check
@@ -1,2 +1,2 @@
-GroundTypeTag[T]

-GroundTypeTag[List[T]]

+ConcreteTypeTag[T]

+ConcreteTypeTag[List[T]]

diff --git a/test/files/run/macro-reify-typetag-typeparams-tags.check b/test/files/run/macro-reify-typetag-typeparams-tags.check
index 24612cd4b7..d75b3c72b2 100644
--- a/test/files/run/macro-reify-typetag-typeparams-tags.check
+++ b/test/files/run/macro-reify-typetag-typeparams-tags.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[List[Int]]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[List[Int]]

diff --git a/test/files/run/macro-reify-typetag-usegroundtypetag.check b/test/files/run/macro-reify-typetag-usegroundtypetag.check
index 24612cd4b7..d75b3c72b2 100644
--- a/test/files/run/macro-reify-typetag-usegroundtypetag.check
+++ b/test/files/run/macro-reify-typetag-usegroundtypetag.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[List[Int]]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[List[Int]]

diff --git a/test/files/run/macro-reify-typetag-usegroundtypetag/Test.scala b/test/files/run/macro-reify-typetag-usegroundtypetag/Test.scala
index c9b210f35a..de235f51cc 100644
--- a/test/files/run/macro-reify-typetag-usegroundtypetag/Test.scala
+++ b/test/files/run/macro-reify-typetag-usegroundtypetag/Test.scala
@@ -1,7 +1,7 @@
 import scala.reflect.mirror._
 
 object Test extends App {
-  def fooTypeTag[T: GroundTypeTag] = {
+  def fooTypeTag[T: ConcreteTypeTag] = {
     println(implicitly[TypeTag[T]])
     println(implicitly[TypeTag[List[T]]])
   }
diff --git a/test/files/run/macro-typecheck-macrosdisabled.check b/test/files/run/macro-typecheck-macrosdisabled.check
index 9760c117a7..b432a539fc 100644
--- a/test/files/run/macro-typecheck-macrosdisabled.check
+++ b/test/files/run/macro-typecheck-macrosdisabled.check
@@ -1,5 +1,5 @@
 {

   val $mr: reflect.mirror.type = scala.reflect.`package`.mirror;

-  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.GroundTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))

+  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))

 }

 mr.reify[Int](2)

diff --git a/test/files/run/macro-undetparams-consfromsls.check b/test/files/run/macro-undetparams-consfromsls.check
index 6bf9bcca5a..49e9140d5a 100644
--- a/test/files/run/macro-undetparams-consfromsls.check
+++ b/test/files/run/macro-undetparams-consfromsls.check
@@ -1,5 +1,5 @@
-A = GroundTypeTag[Int]

-B = GroundTypeTag[Nothing]

+A = ConcreteTypeTag[Int]

+B = ConcreteTypeTag[Nothing]

 List(1)

-A = GroundTypeTag[Any]

+A = ConcreteTypeTag[Any]

 List(abc, 1)

diff --git a/test/files/run/macro-undetparams-implicitval.check b/test/files/run/macro-undetparams-implicitval.check
index 352a2e6480..6c2b601aa5 100644
--- a/test/files/run/macro-undetparams-implicitval.check
+++ b/test/files/run/macro-undetparams-implicitval.check
@@ -1 +1 @@
-GroundTypeTag[Nothing]

+ConcreteTypeTag[Nothing]

diff --git a/test/files/run/macro-undetparams-macroitself.check b/test/files/run/macro-undetparams-macroitself.check
index 60c021a35b..e57fc1217b 100644
--- a/test/files/run/macro-undetparams-macroitself.check
+++ b/test/files/run/macro-undetparams-macroitself.check
@@ -1,2 +1,2 @@
-GroundTypeTag[Int]

-GroundTypeTag[String]

+ConcreteTypeTag[Int]

+ConcreteTypeTag[String]

diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check
index 761aa1ca72..1b6e24ed20 100644
--- a/test/files/run/primitive-sigs-2.check
+++ b/test/files/run/primitive-sigs-2.check
@@ -1,7 +1,7 @@
 T<java.lang.Object>

 List(A, char, class java.lang.Object)

 a

-public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.api.TypeTags.scala.reflect.api.TypeTags$GroundTypeTag<T>)

+public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.api.TypeTags.scala.reflect.api.TypeTags$ConcreteTypeTag<T>)

 public float[] Arr.arr3(float[][])

 public scala.collection.immutable.List<java.lang.Character> Arr.arr2(java.lang.Character[])

 public scala.collection.immutable.List<java.lang.Object> Arr.arr1(int[])

diff --git a/test/files/run/reify_newimpl_25.check b/test/files/run/reify_newimpl_25.check
index 31ece627e1..37ff83c9ee 100644
--- a/test/files/run/reify_newimpl_25.check
+++ b/test/files/run/reify_newimpl_25.check
@@ -14,7 +14,7 @@ scala> {
 <console>:13: free term: Ident(newTermName("x")) defined by res0  in <console>:12:21

                 val tt = implicitly[TypeTag[x.type]]

                                    ^

-GroundTypeTag[x.type]

+ConcreteTypeTag[x.type]

 

 scala> 

 

diff --git a/test/files/run/reify_newimpl_26.check b/test/files/run/reify_newimpl_26.check
index 68b0ee8c99..bfbf1d653d 100644
--- a/test/files/run/reify_newimpl_26.check
+++ b/test/files/run/reify_newimpl_26.check
@@ -16,7 +16,7 @@ scala> def foo[T]{
 foo: [T]=> Unit

 

 scala> foo[Int]

-GroundTypeTag[List[T]]

+ConcreteTypeTag[List[T]]

 

 scala> 

 

diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.check b/test/files/run/toolbox_typecheck_macrosdisabled.check
index fe2323ea06..cf2420bc17 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled.check
+++ b/test/files/run/toolbox_typecheck_macrosdisabled.check
@@ -1,5 +1,5 @@
 {

   val $mr: mr.type = mr;

-  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.GroundTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))

+  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))

 }

 mr.reify[Int](2)

diff --git a/test/files/run/typetags_core.check b/test/files/run/typetags_core.check
index d1b71f0926..62fcb481ae 100644
--- a/test/files/run/typetags_core.check
+++ b/test/files/run/typetags_core.check
@@ -1,30 +1,30 @@
 true

-GroundTypeTag[Byte]

+ConcreteTypeTag[Byte]

 true

-GroundTypeTag[Short]

+ConcreteTypeTag[Short]

 true

-GroundTypeTag[Char]

+ConcreteTypeTag[Char]

 true

-GroundTypeTag[Int]

+ConcreteTypeTag[Int]

 true

-GroundTypeTag[Long]

+ConcreteTypeTag[Long]

 true

-GroundTypeTag[Float]

+ConcreteTypeTag[Float]

 true

-GroundTypeTag[Double]

+ConcreteTypeTag[Double]

 true

-GroundTypeTag[Boolean]

+ConcreteTypeTag[Boolean]

 true

-GroundTypeTag[Unit]

+ConcreteTypeTag[Unit]

 true

-GroundTypeTag[Any]

+ConcreteTypeTag[Any]

 true

-GroundTypeTag[Object]

+ConcreteTypeTag[Object]

 true

-GroundTypeTag[AnyVal]

+ConcreteTypeTag[AnyVal]

 true

-GroundTypeTag[AnyRef]

+ConcreteTypeTag[AnyRef]

 true

-GroundTypeTag[Null]

+ConcreteTypeTag[Null]

 true

-GroundTypeTag[Nothing]

+ConcreteTypeTag[Nothing]