From e7ffd7e1486a04a2d9e5642c35455fdb556d3554 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Wed, 6 Jun 2018 00:23:27 +0900
Subject: Scala 2.13.0-M4

---
 core/shared/src/main/scala/magnolia.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'core/shared/src/main')

diff --git a/core/shared/src/main/scala/magnolia.scala b/core/shared/src/main/scala/magnolia.scala
index 6001977..1d45fa7 100644
--- a/core/shared/src/main/scala/magnolia.scala
+++ b/core/shared/src/main/scala/magnolia.scala
@@ -15,7 +15,6 @@
 package magnolia
 
 import scala.annotation.compileTimeOnly
-import scala.collection.breakOut
 import scala.collection.mutable
 import scala.language.existentials
 import scala.language.higherKinds
@@ -518,7 +517,7 @@ private[magnolia] object CompileTimeState {
       (frames.drop(1), frames).zipped.collect {
         case (Frame(path, tp1, _), Frame(_, tp2, _))
           if !(tp1 =:= tp2) => path
-      } (breakOut)
+      }.toList
 
     override def toString: String =
       frames.mkString("magnolia stack:\n", "\n", "\n")
-- 
cgit v1.2.3


From 905de4e7bab4c252d9f879f25bc66c38855e401b Mon Sep 17 00:00:00 2001
From: Vladimir Pavkin <vpavkin@gmail.com>
Date: Thu, 7 Jun 2018 13:56:07 +0300
Subject: Use encodedName to avoid invalid identifier names

---
 core/shared/src/main/scala/magnolia.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'core/shared/src/main')

diff --git a/core/shared/src/main/scala/magnolia.scala b/core/shared/src/main/scala/magnolia.scala
index 1d45fa7..e46dd3a 100644
--- a/core/shared/src/main/scala/magnolia.scala
+++ b/core/shared/src/main/scala/magnolia.scala
@@ -101,7 +101,7 @@ object Magnolia {
     def knownSubclasses(sym: ClassSymbol): List[Symbol] = {
       val children = sym.knownDirectSubclasses.toList
       val (abstractTypes, concreteTypes) = children.partition(_.isAbstract)
-      
+
       abstractTypes.map(_.asClass).flatMap(knownSubclasses(_)) ::: concreteTypes
     }
 
@@ -167,7 +167,7 @@ object Magnolia {
 
     def directInferImplicit(genericType: Type, typeConstructor: Type): Option[Tree] = {
       val genericTypeName = genericType.typeSymbol.name.decodedName.toString.toLowerCase
-      val assignedName = TermName(c.freshName(s"${genericTypeName}Typeclass"))
+      val assignedName = TermName(c.freshName(s"${genericTypeName}Typeclass")).encodedName.toTermName
       val typeSymbol = genericType.typeSymbol
       val classType = if (typeSymbol.isClass) Some(typeSymbol.asClass) else None
       val isCaseClass = classType.exists(_.isCaseClass)
@@ -313,7 +313,7 @@ object Magnolia {
             ..$assignments
 
             $typeNameDef
-            
+
             ${c.prefix}.combine($magnoliaPkg.Magnolia.caseClass[$typeConstructor, $genericType](
               $typeName,
               false,
@@ -374,11 +374,11 @@ object Magnolia {
         Some(q"""{
             val $subtypesVal: $scalaPkg.Array[$magnoliaPkg.Subtype[$typeConstructor, $genericType]] =
               new $scalaPkg.Array(${assignments.size})
-            
+
             ..$assignments
 
             $typeNameDef
-            
+
             ${c.prefix}.dispatch(new $magnoliaPkg.SealedTrait(
               $typeName,
               $subtypesVal: $scalaPkg.Array[$magnoliaPkg.Subtype[$typeConstructor, $genericType]],
-- 
cgit v1.2.3