Skip to content

Commit 3d06d66

Browse files
authored
Merge pull request #1289 from typelevel/topic/update-twiddles-1.1.0-RC1
Update to twiddles 1.1.0-RC1
2 parents 45d8a23 + aa0f05c commit 3d06d66

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

build.sbt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / tlBaseVersion := "1.0"
1+
ThisBuild / tlBaseVersion := "1.1"
22

33
// Our Scala versions.
44
lazy val `scala-2.13` = "2.13.18"
@@ -57,6 +57,10 @@ ThisBuild / mimaBinaryIssueFilters ++= List(
5757
ProblemFilters.exclude[MissingTypesProblem]("skunk.net.protocol.Startup$"),
5858
ProblemFilters.exclude[DirectMissingMethodProblem]("skunk.net.protocol.Startup.authenticationSASL"),
5959
ProblemFilters.exclude[MissingClassProblem]("skunk.net.protocol.StartupCompanionPlatform"),
60+
ProblemFilters.exclude[DirectMissingMethodProblem]("skunk.Codec.twiddlesPrependOps"),
61+
ProblemFilters.exclude[DirectMissingMethodProblem]("skunk.Decoder.twiddlesPrependOps"),
62+
ProblemFilters.exclude[DirectMissingMethodProblem]("skunk.Encoder.twiddlesPrependOps"),
63+
ProblemFilters.exclude[DirectMissingMethodProblem]("skunk.Fragment.twiddlesPrependOps"),
6064
)
6165

6266
ThisBuild / tlFatalWarnings := false
@@ -130,7 +134,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
130134
"org.typelevel" %%% "otel4s-semconv" % otel4sVersion,
131135
"org.typelevel" %%% "otel4s-semconv-metrics" % otel4sVersion,
132136
"org.tpolecat" %%% "sourcepos" % "1.2.0",
133-
"org.typelevel" %%% "twiddles-core" % "1.0.0",
137+
"org.typelevel" %%% "twiddles-core" % "1.1.0-RC1",
134138
"com.armanbilge" %%% "saslprep" % "0.1.2",
135139
) ++ Seq(
136140
"com.beachape" %%% "enumeratum" % "1.9.0",

modules/core/shared/src/main/scala-3/syntax/StringContextOps.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ object StringContextOps {
129129
case '{$a: Encoder[a]} => '{$a.imap(_ *: EmptyTuple)(_.head)}
130130
}
131131
encoders.init.foldRight(last) { case ('{$a: Encoder[a]}, '{$acc: Encoder[t & Tuple]}) =>
132-
// TODO Should be able to use *: but as of twiddles 1.0.0-RC2 that no longer works; see https://github.com/typelevel/twiddles/issues/146
133-
'{_root_.org.typelevel.twiddles.Twiddles.prepend($a, $acc)}
132+
'{$a *: $acc}
134133
}
135134
}
136135

modules/core/shared/src/main/scala/AppliedFragment.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ sealed trait AppliedFragment { outer =>
1919

2020
/** Concatenate this `AppliedFragment` with `other`, pairwise. */
2121
def |+|(other: AppliedFragment): AppliedFragment =
22-
// TODO Cast is needed to workaround issue introduced by twiddles 1.0.0-RC2; see https://github.com/typelevel/twiddles/issues/146
23-
AppliedFragment((fragment *: other.fragment).asInstanceOf[Fragment[A *: other.A *: EmptyTuple]], argument *: other.argument *: EmptyTuple)
22+
AppliedFragment(fragment *: other.fragment, argument *: other.argument *: EmptyTuple)
2423

2524
override def toString =
2625
s"AppliedFragment($fragment, $argument)"

0 commit comments

Comments
 (0)