From 454df86d628929338210db89a5002186c0699a1d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 10 Jul 2022 05:37:24 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.5.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a8136c5f..082cecab 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = "scala3" -version = "3.5.2" +version = "3.5.8" maxColumn = 80 From 2c2205a1b787e4cb36ef071f7ceceb366c86da28 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 10 Jul 2022 05:37:40 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.5.8 Executed command: scalafmt --non-interactive --- .../main/scala/com/thoughtworks/dsl/Dsl.scala | 40 +++++++++---------- .../com/thoughtworks/dsl/keywords/Each.scala | 2 +- .../com/thoughtworks/dsl/keywords/Shift.scala | 8 ++-- .../thoughtworks/dsl/keywords/TryCatch.scala | 16 ++++---- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala b/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala index a6a8e806..2b8291e2 100644 --- a/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala +++ b/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala @@ -96,10 +96,10 @@ private[dsl] trait LowPriorityDsl0 extends LowPriorityDsl1 { this: Dsl.type => object Dsl extends LowPriorityDsl0 { def apply[Keyword, Domain, Value]: ( - ( - Keyword, - (Value => Domain) - ) => Domain + ( + Keyword, + (Value => Domain) + ) => Domain ) =:= Dsl[Keyword, Domain, Value] = summon private[dsl] abstract class TrampolineFunction1[-A, +R] extends (A => R) { @@ -165,10 +165,10 @@ object Dsl extends LowPriorityDsl0 { Dsl[Keyword, Domain, Value] object StackSafe: def apply[Keyword, Domain, Value]: ( - ( - Keyword, - (Value => Domain) - ) => Domain + ( + Keyword, + (Value => Domain) + ) => Domain ) =:= StackSafe[Keyword, Domain, Value] = summon @@ -183,10 +183,10 @@ object Dsl extends LowPriorityDsl0 { Dsl[Keyword, Domain, Value] object StackUnsafe: def apply[Keyword, Domain, Value]: ( - ( - Keyword, - (Value => Domain) - ) => Domain + ( + Keyword, + (Value => Domain) + ) => Domain ) =:= StackUnsafe[Keyword, Domain, Value] = summon @@ -202,10 +202,10 @@ object Dsl extends LowPriorityDsl0 { ] = Dsl[Keyword, Domain, Value] object Composed: def apply[Keyword, Domain, Value]: ( - ( - Keyword, - (Value => Domain) - ) => Domain + ( + Keyword, + (Value => Domain) + ) => Domain ) =:= Composed[Keyword, Domain, Value] = summon @@ -220,10 +220,10 @@ object Dsl extends LowPriorityDsl0 { Dsl[Keyword, Domain, Value] object Original: def apply[Keyword, Domain, Value]: ( - ( - Keyword, - (Value => Domain) - ) => Domain + ( + Keyword, + (Value => Domain) + ) => Domain ) =:= Original[Keyword, Domain, Value] = summon diff --git a/keywords-Each/src/main/scala/com/thoughtworks/dsl/keywords/Each.scala b/keywords-Each/src/main/scala/com/thoughtworks/dsl/keywords/Each.scala index a9f0fe43..239e8274 100644 --- a/keywords-Each/src/main/scala/com/thoughtworks/dsl/keywords/Each.scala +++ b/keywords-Each/src/main/scala/com/thoughtworks/dsl/keywords/Each.scala @@ -83,7 +83,7 @@ object Each { object ToKeyword { def apply[ComprehensionOrKeyword, Keyword]: ( - ComprehensionOrKeyword => Keyword + ComprehensionOrKeyword => Keyword ) =:= ToKeyword[ComprehensionOrKeyword, Keyword] = summon given [ diff --git a/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala b/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala index 7e53537d..2e43dda7 100644 --- a/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala +++ b/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala @@ -101,10 +101,10 @@ object Shift extends LowPriorityShift0 { ], NewDomain, Value] = Dsl.Original[Shift[Domain, Value], NewDomain, Value] object StackSafeShiftDsl: def apply[Domain, NewDomain, Value]: ( - ( - Shift[Domain, Value], - Value => NewDomain - ) => NewDomain + ( + Shift[Domain, Value], + Value => NewDomain + ) => NewDomain ) =:= StackSafeShiftDsl[Domain, NewDomain, Value] = Dsl.Original.apply[Shift[Domain, Value], NewDomain, Value] diff --git a/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala b/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala index 9402084b..19918d67 100644 --- a/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala +++ b/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala @@ -29,16 +29,16 @@ object TryCatch extends TryCatch.LowPriority0 { ) ?=> Dsl.Composed[TryCatch[BlockKeyword, CaseKeyword], OuterDomain, Value] object DslComposer: def apply[OuterDomain, Value, BlockDomain]: ( - [ - BlockKeyword, - CaseKeyword - ] => ( - Dsl.Searching[BlockKeyword, BlockDomain, Value], - Dsl.Searching[CaseKeyword, BlockDomain, Value] - ) ?=> Dsl.Composed[TryCatch[ + [ BlockKeyword, CaseKeyword - ], OuterDomain, Value] + ] => ( + Dsl.Searching[BlockKeyword, BlockDomain, Value], + Dsl.Searching[CaseKeyword, BlockDomain, Value] + ) ?=> Dsl.Composed[TryCatch[ + BlockKeyword, + CaseKeyword + ], OuterDomain, Value] ) =:= DslComposer[OuterDomain, Value, BlockDomain] = summon private[TryCatch] trait LowPriority0: From 4cbf6f6f67f88101478c732162d983e82697eeca Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 10 Jul 2022 05:37:40 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.5.8' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..8191cb70 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.5.8 +2c2205a1b787e4cb36ef071f7ceceb366c86da28