From 4f97ea70f6b2a4cad33f208653ed95d5618fffce Mon Sep 17 00:00:00 2001 From: SimonGuilloud <sim-guilloud@bluewin.ch> Date: Mon, 3 Oct 2022 22:58:17 +0200 Subject: [PATCH] scalafix 3. --- build.sbt | 2 +- lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala | 2 +- lisa-front/src/test/scala/lisa/front/UnificationTests.scala | 2 +- lisa-utils/src/test/scala/lisa/kernel/FolTests.scala | 2 +- .../src/test/scala/lisa/kernel/InvalidProofPathTests.scala | 2 +- lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala | 2 +- lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala | 2 +- lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 6398b4f9..37875fad 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ val commonSettings3 = Seq( //"-source:future", re-enable when liancheng/scalafix-organize-imports#221 is fixed "-no-indent", "-old-syntax", - "-source:future-migration", + //"-source:future-migration", //"-rewrite", ), libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.10" % "test", diff --git a/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala b/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala index 1f13351e..0c50fac4 100644 --- a/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala +++ b/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala @@ -1,6 +1,6 @@ package lisa.front -import lisa.front.{*, given} +import lisa.front.{_, given} import org.scalatest.funsuite.AnyFunSuite import scala.language.adhocExtensions diff --git a/lisa-front/src/test/scala/lisa/front/UnificationTests.scala b/lisa-front/src/test/scala/lisa/front/UnificationTests.scala index 3c399541..26103982 100644 --- a/lisa-front/src/test/scala/lisa/front/UnificationTests.scala +++ b/lisa-front/src/test/scala/lisa/front/UnificationTests.scala @@ -4,7 +4,7 @@ import lisa.front.fol.FOL.LabelType import lisa.front.fol.FOL.WithArityType import lisa.front.printer.FrontPositionedPrinter import lisa.front.printer.FrontPrintStyle -import lisa.front.{*, given} +import lisa.front.{_, given} import org.scalatest.Ignore import org.scalatest.funsuite.AnyFunSuite diff --git a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala index 3de689b8..c3e944f3 100644 --- a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala +++ b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala @@ -6,7 +6,7 @@ import lisa.kernel.proof.RunningTheory.* import lisa.kernel.proof.SCProof import lisa.kernel.proof.SCProofChecker import lisa.kernel.proof.SequentCalculus.* -import lisa.utils.Helpers.{*, given} +import lisa.utils.Helpers.{_, given} import lisa.utils.Printer import org.scalatest.funsuite.AnyFunSuite diff --git a/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala b/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala index d62ef6ad..1bf566e3 100644 --- a/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala +++ b/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala @@ -4,7 +4,7 @@ import lisa.kernel.proof.SCProofCheckerJudgement.SCInvalidProof import lisa.kernel.proof.SequentCalculus.* import lisa.kernel.proof.* import lisa.test.ProofCheckerSuite -import lisa.utils.Helpers.{*, given} +import lisa.utils.Helpers.{_, given} class InvalidProofPathTests extends ProofCheckerSuite { def checkPath(invalidProof: SCProof, expectedPath: Seq[Int]): Unit = { diff --git a/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala b/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala index c5ba765c..d00afd89 100644 --- a/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala +++ b/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala @@ -6,7 +6,7 @@ import lisa.kernel.proof.RunningTheory.* import lisa.kernel.proof.SCProof import lisa.kernel.proof.SCProofChecker import lisa.kernel.proof.SequentCalculus.* -import lisa.utils.Helpers.{*, given} +import lisa.utils.Helpers.{_, given} import lisa.utils.Printer import org.scalatest.funsuite.AnyFunSuite diff --git a/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala b/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala index 50212e1a..4a989fa2 100644 --- a/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala +++ b/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala @@ -6,7 +6,7 @@ import lisa.kernel.proof.SCProofCheckerJudgement import lisa.kernel.proof.SCProofCheckerJudgement.SCInvalidProof import lisa.kernel.proof.SequentCalculus.Sequent import lisa.kernel.proof.SequentCalculus.isSameSequent -import lisa.utils.Helpers.{*, given} +import lisa.utils.Helpers.{_, given} import lisa.utils.Printer import org.scalatest.funsuite.AnyFunSuite diff --git a/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala b/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala index fe7678b8..151fdbb1 100644 --- a/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala +++ b/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala @@ -2,7 +2,7 @@ package lisa.test import lisa.kernel.fol.FOL.* import lisa.kernel.proof.RunningTheory -import lisa.utils.Helpers.{*, given} +import lisa.utils.Helpers.{_, given} trait TestTheoryAxioms { final val p1 = ConstantPredicateLabel("p1", 1) -- GitLab