UrlForm decoding support

modules/core/src-2.12/ScalaCompat.scala

@@ -28,9 +28,4 @@ private[smithy4s] trait ScalaCompat {
     private def opt[A](a: => A): Option[A] = try { Some(a) }
     catch { case scala.util.control.NonFatal(_) => None }
   }
-
-  private[smithy4s] implicit final class MapOps[K, V](val map: Map[K, V]) {
-    def mapToValues[W](f: V => W): Map[K, W] = map.mapValues(f)
-  }
-
 }

modules/core/src-2.13/ScalaCompat.scala

@@ -16,8 +16,4 @@
 
 package smithy4s
 
-private[smithy4s] trait ScalaCompat {
-  implicit final class MapOps[K, V](val map: Map[K, V]) {
-    def mapToValues[W](f: V => W): Map[K, W] = map.view.mapValues(f).toMap
-  }
-}
+private[smithy4s] trait ScalaCompat {}

modules/core/src-3/ScalaCompat.scala

@@ -16,8 +16,4 @@
 
 package smithy4s
 
-private[smithy4s] trait ScalaCompat {
-  implicit final class MapOps[K, V](val map: Map[K, V]) {
-    def mapToValues[W](f: V => W): Map[K, W] = map.view.mapValues(f).toMap
-  }
-}
+private[smithy4s] trait ScalaCompat {}

modules/core/src/smithy4s/http/internals/UrlFormDataDecoderSchemaVisitor.scala

@@ -30,9 +30,7 @@ private[http] class UrlFormDataDecoderSchemaVisitor(
     // https://smithy.io/2.0/aws/protocols/aws-ec2-query-protocol.html?highlight=ec2%20query%20protocol#query-key-resolution.
     ignoreUrlFormFlattened: Boolean,
     capitalizeStructAndUnionMemberNames: Boolean
-) extends SchemaVisitor.Cached[UrlFormDataDecoder]
-    with smithy4s.ScalaCompat {
-  compile =>
+) extends SchemaVisitor.Cached[UrlFormDataDecoder] { compile =>
 
   override def primitive[P](
       shapeId: ShapeId,
@@ -49,6 +47,7 @@ private[http] class UrlFormDataDecoderSchemaVisitor(
     }
   }
 
+  @annotation.nowarn("msg=Unused import")
   override def collection[C[_], A](
       shapeId: ShapeId,
       hints: Hints,
@@ -74,6 +73,7 @@ private[http] class UrlFormDataDecoderSchemaVisitor(
           //
           // We can't assume they were encoded in order. That's why we have to
           // then sort by index.
+          import scala.collection.compat._
           val groupedAndSortedCursors = values
             .collect {
               case formData @ UrlForm.FormData(
@@ -88,11 +88,9 @@ private[http] class UrlFormDataDecoderSchemaVisitor(
               index
             }
             .map { case (index, values) =>
-              UrlFormCursor(
-                history,
-                values
+              UrlFormCursor(history, values).down(
+                PayloadPath.Segment.Index(index)
               )
-                .down(PayloadPath.Segment.Index(index))
             }
           groupedAndSortedCursors
             .traverse[UrlFormDecodeError, A](memberDecoder.decode(_))

modules/xml/src/smithy4s/xml/internals/XmlEncoderSchemaVisitor.scala

@@ -30,8 +30,7 @@ import cats.kernel.Monoid
 
 private[smithy4s] class XmlEncoderSchemaVisitor(
     val cache: CompilationCache[XmlEncoder]
-) extends SchemaVisitor.Cached[XmlEncoder]
-    with smithy4s.ScalaCompat { compile =>
+) extends SchemaVisitor.Cached[XmlEncoder] { compile =>
 
   def primitive[P](
       shapeId: ShapeId,