From f93ad6f89a01db4f1cf85df096e9d2ff0db306e1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Jul 2023 16:51:08 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 61fc6a04da..cb4bbeda11 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.4" +version = "3.7.6" runner.dialect = scala213 fileOverride { From 1b2091c13571348b534076f2183ced2cd2ff67a9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Jul 2023 16:52:10 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.6 Executed command: scalafmt --non-interactive --- .../apalache/tla/bmcmt/profiler/RuleStatLocator.scala | 4 ++-- .../tla/bmcmt/TestSymbStateRewriterAssignment.scala | 2 +- .../tla/bmcmt/TestSymbStateRewriterChooseOrGuess.scala | 6 +++--- .../apalache/io/annotations/TestAnnotationParser.scala | 2 +- .../apalache/io/annotations/TestCommentPreprocessor.scala | 2 +- .../apalache/tla/typecheck/TestDefaultType1Parser.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/profiler/RuleStatLocator.scala b/tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/profiler/RuleStatLocator.scala index e33ffdae30..fb6f83973b 100644 --- a/tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/profiler/RuleStatLocator.scala +++ b/tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/profiler/RuleStatLocator.scala @@ -5,8 +5,8 @@ import at.forsyte.apalache.io.OutputManager import scala.collection.immutable.SortedMap /** - * The locator keeps a registry of RuleStat instances - * -- one per rule name -- and finds the required instances when needed. + * The locator keeps a registry of RuleStat instances -- one per rule name -- and finds the required instances when + * needed. * * @author * Igor Konnov diff --git a/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterAssignment.scala b/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterAssignment.scala index 2cd9d25815..09dac17186 100644 --- a/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterAssignment.scala +++ b/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterAssignment.scala @@ -454,7 +454,7 @@ trait TestSymbStateRewriterAssignment extends RewriterBase { val rewriter = create(rewriterType) rewriter.rewriteUntilDone(state) assert(rewriter.solverContext.sat()) - // there is not much to check here, since it is just a function that returns an integer + // there is not much to check here, since it is just a function that returns an integer } // the model checker will never meet such an expression, as it will be optimized into several existentials by ExprOptimizer diff --git a/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterChooseOrGuess.scala b/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterChooseOrGuess.scala index d72a07f802..8d60b6fdca 100644 --- a/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterChooseOrGuess.scala +++ b/tla-bmcmt/src/test/scala/at/forsyte/apalache/tla/bmcmt/TestSymbStateRewriterChooseOrGuess.scala @@ -68,9 +68,9 @@ trait TestSymbStateRewriterChooseOrGuess extends RewriterBase { rewriter.rewriteUntilDone(state) // the buggy implementation of choose fails on a dynamically empty set assert(solverContext.sat()) - // The semantics of choose does not restrict the outcome on the empty sets, - // so we do not test for anything here. Our previous implementation of CHOOSE produced default values in this case, - // but this happened to be error-prone and sometimes conflicting with other rules. So, no default values. + // The semantics of choose does not restrict the outcome on the empty sets, + // so we do not test for anything here. Our previous implementation of CHOOSE produced default values in this case, + // but this happened to be error-prone and sometimes conflicting with other rules. So, no default values. } test("""CHOOSE x \in {}: x > 1""") { rewriterType: SMTEncoding => diff --git a/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestAnnotationParser.scala b/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestAnnotationParser.scala index ffeddb8dad..f8cde2ef77 100644 --- a/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestAnnotationParser.scala +++ b/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestAnnotationParser.scala @@ -180,7 +180,7 @@ class TestAnnotationParser extends AnyFunSuite with Checkers { // To see how testing is different from verification, // replace 'passed' with 'falsified' and observe that no error will be found ;-) passed - // no exceptions + // no exceptions } }, minSuccessful(300), diff --git a/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestCommentPreprocessor.scala b/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestCommentPreprocessor.scala index 1d0344bba9..84e8a6401c 100644 --- a/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestCommentPreprocessor.scala +++ b/tla-io/src/test/scala/at/forsyte/apalache/io/annotations/TestCommentPreprocessor.scala @@ -166,7 +166,7 @@ class TestCommentPreprocessor extends AnyFunSuite with Checkers with Matchers { { forAll(asciiStr) { str => hasAnnotationsWhenNonEmpty(str) - // no exceptions + // no exceptions } }, minSuccessful(300), diff --git a/tla-typechecker/src/test/scala/at/forsyte/apalache/tla/typecheck/TestDefaultType1Parser.scala b/tla-typechecker/src/test/scala/at/forsyte/apalache/tla/typecheck/TestDefaultType1Parser.scala index 58f76c83c2..b57b95b044 100644 --- a/tla-typechecker/src/test/scala/at/forsyte/apalache/tla/typecheck/TestDefaultType1Parser.scala +++ b/tla-typechecker/src/test/scala/at/forsyte/apalache/tla/typecheck/TestDefaultType1Parser.scala @@ -378,7 +378,7 @@ class TestDefaultType1Parser extends AnyFunSuite with Checkers with TlaType1Gen case _: Throwable => falsified } - // no exceptions + // no exceptions } }, minSuccessful(300)) } From 62c18628595233cd226a24912e4809b7777896eb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Jul 2023 16:52:10 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.6' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b5eeee18a9..05d4c13a59 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.7.0 940cde8dd83d26a64657982c4b59ec1de2df94e4 + +# Scala Steward: Reformat with scalafmt 3.7.6 +1b2091c13571348b534076f2183ced2cd2ff67a9