[base] Inline one-line UnapplyExprs companion object methods, removing need for UnapplyExprs companion object

Author: rayrobdod

Base/src/main/scala/Extractor.scala

@@ -57,7 +57,7 @@ final class Extractor[Ctx, Expr[+_], Type[_], -A] private[stringContextParserCom
 		val argWithPoss = strings.init.map(x => (((), x._2 + x._1.size)))
 
 		val input = new Input[Unit, Int](strings, argWithPoss)
-		implicit val exprs:UnapplyExprs[IdCtx, Id, ClassTag] = UnapplyExprs.forId
+		implicit val exprs:UnapplyExprs[IdCtx, Id, ClassTag] = new UnapplyExprs
 
 		impl.asInstanceOf[internal.Extractor[IdCtx, Id, ClassTag, A]].extractor(input)(implicitly, implicitly, exprs) match {
 			case s:Success[_, _, _] => {
@@ -127,7 +127,7 @@ final class Extractor[Ctx, Expr[+_], Type[_], -A] private[stringContextParserCom
 		val args = strings.init.map(x => (((), x._2 + x._1.size)))
 
 		val input = new Input[Unit, c.universe.Position](strings, args)
-		implicit val exprs:UnapplyExprs[c.type, c.Expr, c.TypeTag] = UnapplyExprs.forContext(c)
+		implicit val exprs:UnapplyExprs[c.type, c.Expr, c.TypeTag] = new UnapplyExprs()(using typeclass.Exprs.forContext[c.type])
 
 		impl.asInstanceOf[internal.Extractor[c.type, c.Expr, c.TypeTag, A]].extractor(input)(c, implicitly, exprs) match {
 			case s:Success[_, _, _] => {
@@ -185,7 +185,7 @@ final class Extractor[Ctx, Expr[+_], Type[_], -A] private[stringContextParserCom
 		val args2 = strings2.init.map(x => (((), x._2 + x._1.size)))
 
 		val input = new Input[Unit, quotes.reflect.Position](strings2, args2)
-		implicit val exprs:UnapplyExprs[quoted.Quotes, quoted.Expr, TypeCreator] = UnapplyExprs.forQuoted
+		implicit val exprs:UnapplyExprs[quoted.Quotes, quoted.Expr, TypeCreator] = new UnapplyExprs
 
 		impl.asInstanceOf[internal.Extractor[quoted.Quotes, quoted.Expr, TypeCreator, A]].extractor(input) match {
 			case s:Success[_, _, _] => {

Base/src/main/scala/UnapplyExpr.scala

@@ -1,8 +1,5 @@
 package name.rayrobdod.stringContextParserCombinator
 
-import com.eed3si9n.ifdef.ifdef
-import scala.reflect.ClassTag
-
 /**
  * The data needed to create an Unapply
  */
@@ -173,18 +170,3 @@ final class UnapplyExprs[Ctx, Expr[+_], Type[_]](implicit exprs: typeclass.Exprs
 		UnapplyExpr[Ctx, Expr, Type, Z]({(value, ctx) => ev.contraNone(value)(ctx)}, Nil)
 	}
 }
-
-private[stringContextParserCombinator]
-object UnapplyExprs {
-	def forId: UnapplyExprs[IdCtx, Id, ClassTag] = new UnapplyExprs[IdCtx, Id, ClassTag]
-
-	@ifdef("scalaEpochVersion:2")
-	def forContext(c: scala.reflect.macros.blackbox.Context): UnapplyExprs[c.type, c.Expr, c.TypeTag] = {
-		new UnapplyExprs[c.type, c.Expr, c.TypeTag]()(using typeclass.Exprs.forContext[c.type])
-	}
-
-	@ifdef("scalaBinaryVersion:3")
-	def forQuoted: UnapplyExprs[quoted.Quotes, quoted.Expr, TypeCreator] = {
-		new UnapplyExprs[quoted.Quotes, quoted.Expr, TypeCreator]()
-	}
-}