Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix subtle pickle compatibility problem with type aliases #1162

Merged
merged 1 commit into from
May 12, 2021
Merged

Fix subtle pickle compatibility problem with type aliases #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions core/src/main/scala/shapeless/ops/functions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ object function {
}

object FnToProduct extends FnToProductInstances {
type Aux[F, P] = FnToProduct[F] { type Out = P }
def apply[F <: AnyRef](implicit fntop: FnToProduct[F]): Aux[F, fntop.Out] = fntop

private[shapeless] def instance[F, P](toProduct: F => P): Aux[F, P] = new FnToProduct[F] {
Expand All @@ -47,7 +46,6 @@ object function {
trait FnFromProduct[F] extends DepFn1[F] with Serializable

object FnFromProduct extends FnFromProductInstances {
type Aux[F, O] = FnFromProduct[F] { type Out = O }
def apply[F](implicit fnfromp: FnFromProduct[F]): Aux[F, fnfromp.Out] = fnfromp

private[shapeless] def instance[P, F](fromProduct: P => F): Aux[P, F] = new FnFromProduct[P] {
Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala/shapeless/ops/hlists.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,6 @@ object hlist {
trait Tupler[L <: HList] extends DepFn1[L] with Serializable

object Tupler extends TuplerInstances {
type Aux[L <: HList, T] = Tupler[L] { type Out = T }
def apply[L <: HList](implicit tupler: Tupler[L]): Aux[L, tupler.Out] = tupler

private[shapeless] def instance[L <: HList, T](tuple: L => T): Aux[L, T] = new Tupler[L] {
Expand Down
9 changes: 6 additions & 3 deletions project/Boilerplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,11 @@ object Boilerplate {
|import hlist.Tupler
|
|trait TuplerInstances {
| type Aux[L <: HList, T] = Tupler[L] { type Out = T }
-
- implicit def hlistTupler$arity[
- ${`A..N`}
- ]: Tupler.Aux[
- ]: Aux[
- ${`A::N`},
- ${`(A..N)`}
- ] = Tupler.instance { case ${`a::n`} =>
Expand Down Expand Up @@ -173,10 +174,11 @@ object Boilerplate {
|import function.FnToProduct
|
|trait FnToProductInstances {
| type Aux[F, P] = FnToProduct[F] { type Out = P }
-
- implicit def fnToProduct$arity[
- ${`A..N,Res`}
- ]: FnToProduct.Aux[
- ]: Aux[
- ($fnType),
- $hlistFnType
- ] = FnToProduct.instance(fn => $fnBody)
Expand All @@ -201,10 +203,11 @@ object Boilerplate {
|import function.FnFromProduct
|
|trait FnFromProductInstances {
| type Aux[F, O] = FnFromProduct[F] { type Out = O }
-
- implicit def fnFromProduct$arity[
- ${`A..N,Res`}
- ]: FnFromProduct.Aux[
- ]: Aux[
- $hlistFnType,
- $fnType
- ] = FnFromProduct.instance { hf =>
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
scalacOptions += "-deprecation"
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.30"

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
Expand Down