Merge pull request #2142 from paulp/pr/move-implicit-tags

Extracted abstract implicit vals from Types.

2 files changed, 110 insertions, 103 deletions

diff --git a/src/reflect/scala/reflect/api/ImplicitTags.scala b/src/reflect/scala/reflect/api/ImplicitTags.scala
new file mode 100644
index 0000000000..3f377d6cff
--- /dev/null
+++ b/src/reflect/scala/reflect/api/ImplicitTags.scala
@@ -0,0 +1,108 @@
+package scala.reflect
+package api
+
+trait ImplicitTags {
+  self: Types =>
+
+  /** A tag that preserves the identity of the `Type` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val TypeTagg: ClassTag[Type]
+
+  /** A tag that preserves the identity of the `SingletonType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val SingletonTypeTag: ClassTag[SingletonType]
+
+  /** A tag that preserves the identity of the `ThisType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val ThisTypeTag: ClassTag[ThisType]
+
+  /** A tag that preserves the identity of the `SingleType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val SingleTypeTag: ClassTag[SingleType]
+
+  /** A tag that preserves the identity of the `SuperType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val SuperTypeTag: ClassTag[SuperType]
+
+  /** A tag that preserves the identity of the `ConstantType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val ConstantTypeTag: ClassTag[ConstantType]
+
+  /** A tag that preserves the identity of the `TypeRef` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val TypeRefTag: ClassTag[TypeRef]
+
+  /** A tag that preserves the identity of the `CompoundType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val CompoundTypeTag: ClassTag[CompoundType]
+
+  /** A tag that preserves the identity of the `RefinedType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val RefinedTypeTag: ClassTag[RefinedType]
+
+  /** A tag that preserves the identity of the `ClassInfoType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val ClassInfoTypeTag: ClassTag[ClassInfoType]
+
+  /** A tag that preserves the identity of the `MethodType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val MethodTypeTag: ClassTag[MethodType]
+
+  /** A tag that preserves the identity of the `NullaryMethodType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val NullaryMethodTypeTag: ClassTag[NullaryMethodType]
+
+  /** A tag that preserves the identity of the `PolyType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val PolyTypeTag: ClassTag[PolyType]
+
+  /** A tag that preserves the identity of the `ExistentialType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val ExistentialTypeTag: ClassTag[ExistentialType]
+
+  /** A tag that preserves the identity of the `AnnotatedType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val AnnotatedTypeTag: ClassTag[AnnotatedType]
+
+  /** A tag that preserves the identity of the `TypeBounds` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val TypeBoundsTag: ClassTag[TypeBounds]
+
+  /** A tag that preserves the identity of the `BoundedWildcardType` abstract type from erasure.
+   *  Can be used for pattern matching, instance tests, serialization and likes.
+   *  @group Tags
+   */
+  implicit val BoundedWildcardTypeTag: ClassTag[BoundedWildcardType]
+}
diff --git a/src/reflect/scala/reflect/api/Types.scala b/src/reflect/scala/reflect/api/Types.scala
index 143438b8f5..e8e9e9c048 100644
--- a/src/reflect/scala/reflect/api/Types.scala
+++ b/src/reflect/scala/reflect/api/Types.scala
@@ -50,7 +50,8 @@ package api
  *
  *  @contentDiagram hideNodes "*Api"
  */
-trait Types { self: Universe =>
+trait Types extends ImplicitTags {
+  self: Universe =>
 
   /** The type of Scala types, and also Scala type signatures.
    *  (No difference is internally made between the two).
@@ -59,12 +60,6 @@ trait Types { self: Universe =>
    */
   type Type >: Null <: TypeApi
 
-  /** A tag that preserves the identity of the `Type` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val TypeTagg: ClassTag[Type]
-
   /** This constant is used as a special value that indicates that no meaningful type exists.
    *  @group Types
    */
@@ -256,12 +251,6 @@ trait Types { self: Universe =>
    */
   type SingletonType >: Null <: Type
 
-  /** A tag that preserves the identity of the `SingletonType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val SingletonTypeTag: ClassTag[SingletonType]
-
   /** A singleton type that describes types of the form on the left with the
    *  corresponding `ThisType` representation to the right:
    *  {{{
@@ -272,12 +261,6 @@ trait Types { self: Universe =>
    */
   type ThisType >: Null <: AnyRef with SingletonType with ThisTypeApi
 
-  /** A tag that preserves the identity of the `ThisType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val ThisTypeTag: ClassTag[ThisType]
-
   /** The constructor/extractor for `ThisType` instances.
    *  @group Extractors
    */
@@ -316,12 +299,6 @@ trait Types { self: Universe =>
    */
   type SingleType >: Null <: AnyRef with SingletonType with SingleTypeApi
 
-  /** A tag that preserves the identity of the `SingleType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val SingleTypeTag: ClassTag[SingleType]
-
   /** The constructor/extractor for `SingleType` instances.
    *  @group Extractors
    */
@@ -361,12 +338,6 @@ trait Types { self: Universe =>
    */
   type SuperType >: Null <: AnyRef with SingletonType with SuperTypeApi
 
-  /** A tag that preserves the identity of the `SuperType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val SuperTypeTag: ClassTag[SuperType]
-
   /** The constructor/extractor for `SuperType` instances.
    *  @group Extractors
    */
@@ -406,12 +377,6 @@ trait Types { self: Universe =>
    */
   type ConstantType >: Null <: AnyRef with SingletonType with ConstantTypeApi
 
-  /** A tag that preserves the identity of the `ConstantType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val ConstantTypeTag: ClassTag[ConstantType]
-
   /** The constructor/extractor for `ConstantType` instances.
    *  @group Extractors
    */
@@ -450,12 +415,6 @@ trait Types { self: Universe =>
    */
   type TypeRef >: Null <: AnyRef with Type with TypeRefApi
 
-  /** A tag that preserves the identity of the `TypeRef` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val TypeRefTag: ClassTag[TypeRef]
-
   /** The constructor/extractor for `TypeRef` instances.
    *  @group Extractors
    */
@@ -497,12 +456,6 @@ trait Types { self: Universe =>
    */
   type CompoundType >: Null <: AnyRef with Type
 
-  /** A tag that preserves the identity of the `CompoundType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val CompoundTypeTag: ClassTag[CompoundType]
-
   /** The `RefinedType` type defines types of any of the forms on the left,
    *  with their RefinedType representations to the right.
    *  {{{
@@ -515,12 +468,6 @@ trait Types { self: Universe =>
    */
   type RefinedType >: Null <: AnyRef with CompoundType with RefinedTypeApi
 
-  /** A tag that preserves the identity of the `RefinedType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val RefinedTypeTag: ClassTag[RefinedType]
-
   /** The constructor/extractor for `RefinedType` instances.
    *  @group Extractors
    */
@@ -567,12 +514,6 @@ trait Types { self: Universe =>
    */
   type ClassInfoType >: Null <: AnyRef with CompoundType with ClassInfoTypeApi
 
-  /** A tag that preserves the identity of the `ClassInfoType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val ClassInfoTypeTag: ClassTag[ClassInfoType]
-
   /** The constructor/extractor for `ClassInfoType` instances.
    *  @group Extractors
    */
@@ -610,12 +551,6 @@ trait Types { self: Universe =>
    */
   type MethodType >: Null <: AnyRef with Type with MethodTypeApi
 
-  /** A tag that preserves the identity of the `MethodType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val MethodTypeTag: ClassTag[MethodType]
-
   /** The constructor/extractor for `MethodType` instances.
    *  @group Extractors
    */
@@ -660,12 +595,6 @@ trait Types { self: Universe =>
    */
   type NullaryMethodType >: Null <: AnyRef with Type with NullaryMethodTypeApi
 
-  /** A tag that preserves the identity of the `NullaryMethodType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val NullaryMethodTypeTag: ClassTag[NullaryMethodType]
-
   /** The constructor/extractor for `NullaryMethodType` instances.
    *  @group Extractors
    */
@@ -696,12 +625,6 @@ trait Types { self: Universe =>
    */
   type PolyType >: Null <: AnyRef with Type with PolyTypeApi
 
-  /** A tag that preserves the identity of the `PolyType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val PolyTypeTag: ClassTag[PolyType]
-
   /** The constructor/extractor for `PolyType` instances.
    *  @group Extractors
    */
@@ -736,12 +659,6 @@ trait Types { self: Universe =>
    */
   type ExistentialType >: Null <: AnyRef with Type with ExistentialTypeApi
 
-  /** A tag that preserves the identity of the `ExistentialType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val ExistentialTypeTag: ClassTag[ExistentialType]
-
   /** The constructor/extractor for `ExistentialType` instances.
    *  @group Extractors
    */
@@ -777,12 +694,6 @@ trait Types { self: Universe =>
    */
   type AnnotatedType >: Null <: AnyRef with Type with AnnotatedTypeApi
 
-  /** A tag that preserves the identity of the `AnnotatedType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val AnnotatedTypeTag: ClassTag[AnnotatedType]
-
   /** The constructor/extractor for `AnnotatedType` instances.
    *  @group Extractors
    */
@@ -828,12 +739,6 @@ trait Types { self: Universe =>
    */
   type TypeBounds >: Null <: AnyRef with Type with TypeBoundsApi
 
-  /** A tag that preserves the identity of the `TypeBounds` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val TypeBoundsTag: ClassTag[TypeBounds]
-
   /** The constructor/extractor for `TypeBounds` instances.
    *  @group Extractors
    */
@@ -885,12 +790,6 @@ trait Types { self: Universe =>
    */
   type BoundedWildcardType >: Null <: AnyRef with Type with BoundedWildcardTypeApi
 
-  /** A tag that preserves the identity of the `BoundedWildcardType` abstract type from erasure.
-   *  Can be used for pattern matching, instance tests, serialization and likes.
-   *  @group Tags
-   */
-  implicit val BoundedWildcardTypeTag: ClassTag[BoundedWildcardType]
-
   /** The constructor/extractor for `BoundedWildcardType` instances.
    *  @group Extractors
    */