Skip to content

Commit 7b27f6d

Browse files
MateuszKubuszokMateuszKubuszok
committed
Fix @SInCE 1.7.0 -> 1.10.0, restore comments, run scalafmt
1 parent a79cccf commit 7b27f6d

9 files changed

Lines changed: 47 additions & 34 deletions

File tree

‎chimney/src/main/scala-2/io/scalaland/chimney/dsl/PartialTransformerDefinition.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
193193
* @return
194194
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
195195
*
196-
* @since 1.7.0
196+
* @since 1.10.0
197197
*/
198198
def withFieldComputedPartialFailFast[T, U](
199199
selector: To => T,
@@ -259,7 +259,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
259259
* @return
260260
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
261261
*
262-
* @since 1.7.0
262+
* @since 1.10.0
263263
*/
264264
def withFieldComputedPartialFromFailFast[S, T, U](selectorFrom: From => S)(
265265
selectorTo: To => T,
@@ -437,7 +437,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
437437
* @return
438438
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
439439
*
440-
* @since 1.7.0
440+
* @since 1.10.0
441441
*/
442442
def withSealedSubtypeHandledPartialFailFast[Subtype](
443443
f: (Subtype, Boolean) => partial.Result[To]
@@ -447,7 +447,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
447447

448448
/** Alias to [[withSealedSubtypeHandledPartialFailFast]].
449449
*
450-
* @since 1.7.0
450+
* @since 1.10.0
451451
*/
452452
def withEnumCaseHandledPartialFailFast[Subtype](
453453
f: (Subtype, Boolean) => partial.Result[To]
@@ -688,7 +688,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
688688
* @return
689689
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
690690
*
691-
* @since 1.7.0
691+
* @since 1.10.0
692692
*/
693693
def withConstructorPartialFailFast[Ctor](
694694
f: Ctor
@@ -720,7 +720,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
720720
* @return
721721
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
722722
*
723-
* @since 1.7.0
723+
* @since 1.10.0
724724
*/
725725
def withConstructorPartialToFailFast[T, Ctor](selector: To => T)(
726726
f: Ctor

‎chimney/src/main/scala-2/io/scalaland/chimney/dsl/PartialTransformerInto.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
198198
* @return
199199
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
200200
*
201-
* @since 1.7.0
201+
* @since 1.10.0
202202
*/
203203
def withFieldComputedPartialFailFast[T, U](
204204
selector: To => T,
@@ -264,7 +264,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
264264
* @return
265265
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
266266
*
267-
* @since 1.7.0
267+
* @since 1.10.0
268268
*/
269269
def withFieldComputedPartialFromFailFast[S, T, U](selectorFrom: From => S)(
270270
selectorTo: To => T,
@@ -440,7 +440,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
440440
* @return
441441
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
442442
*
443-
* @since 1.7.0
443+
* @since 1.10.0
444444
*/
445445
def withSealedSubtypeHandledPartialFailFast[Subtype](
446446
f: (Subtype, Boolean) => partial.Result[To]
@@ -450,7 +450,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
450450

451451
/** Alias to [[withSealedSubtypeHandledPartialFailFast]].
452452
*
453-
* @since 1.7.0
453+
* @since 1.10.0
454454
*/
455455
def withEnumCaseHandledPartialFailFast[Subtype](
456456
f: (Subtype, Boolean) => partial.Result[To]
@@ -690,7 +690,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
690690
* @return
691691
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
692692
*
693-
* @since 1.7.0
693+
* @since 1.10.0
694694
*/
695695
def withConstructorPartialFailFast[Ctor](
696696
f: Ctor
@@ -722,7 +722,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
722722
* @return
723723
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
724724
*
725-
* @since 1.7.0
725+
* @since 1.10.0
726726
*/
727727
def withConstructorPartialToFailFast[T, Ctor](selector: To => T)(
728728
f: Ctor

‎chimney/src/main/scala-2/io/scalaland/chimney/internal/compiletime/dsl/PartialTransformerDefinitionMacros.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ class PartialTransformerDefinitionMacros(val c: whitebox.Context) extends utils.
204204
Subtype: WeakTypeTag
205205
](f: Tree): Tree = {
206206
val SubtypeTpe = weakTypeOf[Subtype]
207-
val curriedF = q"{ val fn = $f; (subtype: $SubtypeTpe) => (failFast: _root_.scala.Boolean) => fn(subtype, failFast) }"
207+
val curriedF =
208+
q"{ val fn = $f; (subtype: $SubtypeTpe) => (failFast: _root_.scala.Boolean) => fn(subtype, failFast) }"
208209
new ApplyFixedCoproductType {
209210
def apply[FixedSubtype: WeakTypeTag]: Tree = c.prefix.tree
210211
.addOverride(curriedF)

‎chimney/src/main/scala-2/io/scalaland/chimney/internal/compiletime/dsl/PartialTransformerIntoMacros.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ class PartialTransformerIntoMacros(val c: whitebox.Context) extends utils.DslMac
204204
Subtype: WeakTypeTag
205205
](f: Tree): Tree = {
206206
val SubtypeTpe = weakTypeOf[Subtype]
207-
val curriedF = q"{ val fn = $f; (subtype: $SubtypeTpe) => (failFast: _root_.scala.Boolean) => fn(subtype, failFast) }"
207+
val curriedF =
208+
q"{ val fn = $f; (subtype: $SubtypeTpe) => (failFast: _root_.scala.Boolean) => fn(subtype, failFast) }"
208209
new ApplyFixedCoproductType {
209210
def apply[FixedSubtype: WeakTypeTag]: Tree = c.prefix.tree
210211
.addOverride(curriedF)

‎chimney/src/main/scala-3/io/scalaland/chimney/dsl/PartialTransformerDefinition.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
196196
* @return
197197
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
198198
*
199-
* @since 1.7.0
199+
* @since 1.10.0
200200
*/
201201
transparent inline def withFieldComputedPartialFailFast[T, U](
202202
inline selector: To => T,
@@ -262,7 +262,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
262262
* @return
263263
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
264264
*
265-
* @since 1.7.0
265+
* @since 1.10.0
266266
*/
267267
transparent inline def withFieldComputedPartialFromFailFast[S, T, U](inline selectorFrom: From => S)(
268268
inline selectorTo: To => T,
@@ -447,7 +447,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
447447
* @return
448448
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
449449
*
450-
* @since 1.7.0
450+
* @since 1.10.0
451451
*/
452452
transparent inline def withSealedSubtypeHandledPartialFailFast[Subtype](
453453
inline f: (Subtype, Boolean) => partial.Result[To]
@@ -456,7 +456,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
456456

457457
/** Alias to [[withSealedSubtypeHandledPartialFailFast]].
458458
*
459-
* @since 1.7.0
459+
* @since 1.10.0
460460
*/
461461
transparent inline def withEnumCaseHandledPartialFailFast[Subtype](
462462
inline f: (Subtype, Boolean) => partial.Result[To]
@@ -710,7 +710,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
710710
* @return
711711
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
712712
*
713-
* @since 1.7.0
713+
* @since 1.10.0
714714
*/
715715
transparent inline def withConstructorPartialFailFast[Ctor](
716716
inline f: Ctor
@@ -742,7 +742,7 @@ final class PartialTransformerDefinition[From, To, Overrides <: TransformerOverr
742742
* @return
743743
* [[io.scalaland.chimney.dsl.PartialTransformerDefinition]]
744744
*
745-
* @since 1.7.0
745+
* @since 1.10.0
746746
*/
747747
transparent inline def withConstructorPartialToFailFast[T, Ctor](inline selector: To => T)(
748748
inline f: Ctor

‎chimney/src/main/scala-3/io/scalaland/chimney/dsl/PartialTransformerInto.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
200200
* @return
201201
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
202202
*
203-
* @since 1.7.0
203+
* @since 1.10.0
204204
*/
205205
transparent inline def withFieldComputedPartialFailFast[T, U](
206206
inline selector: To => T,
@@ -266,7 +266,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
266266
* @return
267267
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
268268
*
269-
* @since 1.7.0
269+
* @since 1.10.0
270270
*/
271271
transparent inline def withFieldComputedPartialFromFailFast[S, T, U](inline selectorFrom: From => S)(
272272
inline selectorTo: To => T,
@@ -444,7 +444,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
444444
* @return
445445
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
446446
*
447-
* @since 1.7.0
447+
* @since 1.10.0
448448
*/
449449
transparent inline def withSealedSubtypeHandledPartialFailFast[Subtype](
450450
inline f: (Subtype, Boolean) => partial.Result[To]
@@ -453,7 +453,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
453453

454454
/** Alias to [[withSealedSubtypeHandledPartialFailFast]].
455455
*
456-
* @since 1.7.0
456+
* @since 1.10.0
457457
*/
458458
transparent inline def withEnumCaseHandledPartialFailFast[Subtype](
459459
inline f: (Subtype, Boolean) => partial.Result[To]
@@ -695,7 +695,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
695695
* @return
696696
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
697697
*
698-
* @since 1.7.0
698+
* @since 1.10.0
699699
*/
700700
transparent inline def withConstructorPartialFailFast[Ctor](
701701
inline f: Ctor
@@ -727,7 +727,7 @@ final class PartialTransformerInto[From, To, Overrides <: TransformerOverrides,
727727
* @return
728728
* [[io.scalaland.chimney.dsl.PartialTransformerInto]]
729729
*
730-
* @since 1.7.0
730+
* @since 1.10.0
731731
*/
732732
transparent inline def withConstructorPartialToFailFast[T, Ctor](inline selector: To => T)(
733733
inline f: Ctor

‎chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/rules/TransformProductToProductRuleModule.scala‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,13 @@ private[compiletime] trait TransformProductToProductRuleModule { this: Derivatio
8080
case TransformationExpr.TotalExpr(expr) =>
8181
TransformationExpr.PartialExpr(expr.apply(failFastExpr))
8282
case TransformationExpr.PartialExpr(expr) =>
83-
TransformationExpr.PartialExpr(expr.map(Expr.Function1.instance { (fn: Expr[Boolean => partial.Result[To]]) =>
84-
fn.apply(failFastExpr)
85-
}).flatten)
83+
TransformationExpr.PartialExpr(
84+
expr
85+
.map(Expr.Function1.instance { (fn: Expr[Boolean => partial.Result[To]]) =>
86+
fn.apply(failFastExpr)
87+
})
88+
.flatten
89+
)
8690
}
8791
Rule.ExpansionResult.Expanded(appliedExpr)
8892
case Rule.ExpansionResult.AttemptNextRule(reason) => Rule.ExpansionResult.AttemptNextRule(reason)
@@ -432,6 +436,14 @@ private[compiletime] trait TransformProductToProductRuleModule { this: Derivatio
432436
case TransformerOverride.ComputedPartial(sourcePath, _, runtimeData, failFastAware) =>
433437
extractSrcByPath(FromOperation.ComputedPartial, sourcePath, toName).map { extractedSrc =>
434438
import extractedSrc.Underlying as ExtractedSrc, extractedSrc.value as extractedSrcExpr
439+
// We're constructing:
440+
// '{
441+
// ${ runtimeDataStore }(idx)
442+
// .asInstanceOf[$ExtractedSrc => partial.Result[$CtorParam]](${ extractedSrcExpr })
443+
// // prepend sourcePath
444+
// .prependErrorPath(PathElement.Computed("_.toName"))
445+
// }
446+
// (or the failFastAware variant with an extra Boolean => ... curried call)
435447
val partialResult = if (failFastAware) {
436448
val failFastExpr = ctx match {
437449
case TransformationContext.ForPartial(_, failFast) => failFast

‎chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/rules/TransformSealedHierarchyToSealedHierarchyRuleModule.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ private[compiletime] trait TransformSealedHierarchyToSealedHierarchyRuleModule {
7474
Type[SomeFrom] <:< Type[From]
7575
}
7676
.filter {
77-
case (_, TransformerOverride.Unused) => true
78-
case (_, TransformerOverride.Computed(_, targetPath, _)) => targetPath == ctx.currentTgt
77+
case (_, TransformerOverride.Unused) => true
78+
case (_, TransformerOverride.Computed(_, targetPath, _)) => targetPath == ctx.currentTgt
7979
case (_, TransformerOverride.ComputedPartial(_, targetPath, _, _)) => targetPath == ctx.currentTgt
80-
case (_, TransformerOverride.Renamed(_, targetPath)) =>
80+
case (_, TransformerOverride.Renamed(_, targetPath)) =>
8181
targetPath.drop(ctx.currentTgt) match {
8282
case Some(Path.AtSubtype(someTo, Path.Root)) => someTo.Underlying <:< Type[To]
8383
case _ => false

‎chimney/src/main/scala/io/scalaland/chimney/internal/runtime/TransformerOverrides.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ object TransformerOverrides {
3232
final class Constructor[Args <: ArgumentLists, ToPath <: Path, Tail <: Overrides] extends Overrides
3333
final class ConstructorPartial[Args <: ArgumentLists, ToPath <: Path, Tail <: Overrides] extends Overrides
3434
// Computes a partial value after all constructor arguments have been matched, with failFast flag
35-
final class ConstructorPartialFailFast[Args <: ArgumentLists, ToPath <: Path, Tail <: Overrides]
36-
extends Overrides
35+
final class ConstructorPartialFailFast[Args <: ArgumentLists, ToPath <: Path, Tail <: Overrides] extends Overrides
3736
// FIXME (2.0.0 cleanup) - try merging RenameFrom with RenameTo
3837
// Computes a value using manually pointed value from (src: From)
3938
final class RenamedFrom[FromPath <: Path, ToPath <: Path, Tail <: Overrides] extends Overrides

0 commit comments

Comments
 (0)