Remove a few implicit conversions

Author: OlivierBlanvillain

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -70,7 +70,7 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
   override private[dotty] def list(inPackage: String): ClassPathEntries = {
     val (packages, classesAndSources) = aggregates.map { cp =>
       try {
-        cp.list(inPackage)
+        cp.list(inPackage).toTuple
       } catch {
         case ex: java.io.IOException =>
           val e = new FatalError(ex.getMessage)

compiler/src/dotty/tools/dotc/classpath/ClassPath.scala

@@ -6,12 +6,8 @@ package dotty.tools.dotc.classpath
 import dotty.tools.io.AbstractFile
 import dotty.tools.io.ClassRepresentation
 
-case class ClassPathEntries(packages: Seq[PackageEntry], classesAndSources: Seq[ClassRepresentation])
-
-object ClassPathEntries {
-  import scala.language.implicitConversions
-  // to have working unzip method
-  implicit def entry2Tuple(entry: ClassPathEntries): (Seq[PackageEntry], Seq[ClassRepresentation]) = (entry.packages, entry.classesAndSources)
+case class ClassPathEntries(packages: Seq[PackageEntry], classesAndSources: Seq[ClassRepresentation]) {
+  def toTuple = (packages, classesAndSources)
 }
 
 trait ClassFileEntry extends ClassRepresentation {

compiler/src/dotty/tools/dotc/printing/Highlighting.scala

@@ -7,9 +7,6 @@ import core.Contexts.Context
 
 object Highlighting {
 
-  implicit def highlightShow(h: Highlight)(implicit ctx: Context): String =
-    h.show
-
   abstract class Highlight(private val highlight: String) {
     def text: String
 

compiler/src/dotty/tools/dotc/transform/TypeUtils.scala

@@ -12,23 +12,20 @@ import NameOps._
 import language.implicitConversions
 
 object TypeUtils {
-  implicit def decorateTypeUtils(tpe: Type): TypeUtils = new TypeUtils(tpe)
-}
-
-/** A decorator that provides methods on types
- *  that are needed in the transformer pipeline.
- */
-class TypeUtils(val self: Type) extends AnyVal {
-  import TypeUtils._
+  /** A decorator that provides methods on types
+   *  that are needed in the transformer pipeline.
+   */
+  implicit class TypeUtilsOps(val self: Type) extends AnyVal {
 
-  def isErasedValueType(implicit ctx: Context): Boolean =
-    self.isInstanceOf[ErasedValueType]
+    def isErasedValueType(implicit ctx: Context): Boolean =
+      self.isInstanceOf[ErasedValueType]
 
-  def isPrimitiveValueType(implicit ctx: Context): Boolean =
-    self.classSymbol.isPrimitiveValueClass
+    def isPrimitiveValueType(implicit ctx: Context): Boolean =
+      self.classSymbol.isPrimitiveValueClass
 
-  def ensureMethodic(implicit ctx: Context): Type = self match {
-    case self: MethodicType => self
-    case _ => if (ctx.erasedTypes) MethodType(Nil, self) else ExprType(self)
+    def ensureMethodic(implicit ctx: Context): Type = self match {
+      case self: MethodicType => self
+      case _ => if (ctx.erasedTypes) MethodType(Nil, self) else ExprType(self)
+    }
   }
 }

compiler/src/dotty/tools/io/Jar.scala

@@ -40,7 +40,7 @@ class Jar(file: File) extends Iterable[JarEntry] {
 
   protected def errorFn(msg: String): Unit = Console println msg
 
-  private implicit def enrichManifest(m: JManifest): Jar.WManifest = Jar.WManifest(m)
+  import Jar._
 
   lazy val jarFile  = new JarFile(file.jpath.toFile)
   lazy val manifest = withJarInput(s => Option(s.getManifest))
@@ -60,7 +60,7 @@ class Jar(file: File) extends Iterable[JarEntry] {
     finally in.close()
   }
   def jarWriter(mainAttrs: (Attributes.Name, String)*) = {
-    new JarWriter(file, Jar.WManifest(mainAttrs: _*).underlying)
+    new JarWriter(file, Jar.WManifest.apply(mainAttrs: _*).underlying)
   }
 
   override def foreach[U](f: JarEntry => U): Unit = withJarInput { in =>
@@ -132,10 +132,8 @@ object Jar {
 
       m
     }
-    def apply(manifest: JManifest): WManifest = new WManifest(manifest)
-    implicit def unenrichManifest(x: WManifest): JManifest = x.underlying
   }
-  class WManifest(manifest: JManifest) {
+  implicit class WManifest(val manifest: JManifest) {
     for ((k, v) <- initialMainAttrs)
       this(k) = v