From 4a2b1dee0f8b9267d23a5acce2863cd556e1c392 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 00:25:22 +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 58d85e4e..ec6d0f9d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.7.4 +version=3.7.6 maxColumn = 120 assumeStandardLibraryStripMargin = true From 79da8216cac0c6ec8b2d6340c1980674fdd273aa Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 00:25:30 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.6 Executed command: scalafmt --non-interactive --- .../src/test/scala/CommandsLevelDB.scala | 24 ++++----- .../src/test/scala/CommandsNix.scala | 52 +++++++++---------- .../src/test/scala/CommandsRedis.scala | 44 ++++++++-------- examples/scalajs/project/plugins.sbt | 1 - examples/simple-sbt/build.sbt | 11 +++- 5 files changed, 66 insertions(+), 66 deletions(-) diff --git a/examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala b/examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala index 58009ea6..e5f1e4fc 100644 --- a/examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala +++ b/examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala @@ -8,7 +8,6 @@ import org.fusesource.leveldbjni.JniDBFactory._ import scala.util.{Try, Success} import scala.collection.immutable.Map - object CommandsLevelDB extends org.scalacheck.Properties("CommandsLevelDB") { property("leveldbspec") = LevelDBSpec.property() @@ -18,28 +17,26 @@ object CommandsLevelDB extends org.scalacheck.Properties("CommandsLevelDB") { object LevelDBSpec extends Commands { case class State( - open: Boolean, - name: String, - contents: Map[List[Byte],List[Byte]] + open: Boolean, + name: String, + contents: Map[List[Byte], List[Byte]] ) case class Sut( - var name: String, - var db: DB + var name: String, + var db: DB ) { def path = s"db_$name" } - def canCreateNewSut(newState: State, initSuts: Traversable[State], - runningSuts: Traversable[Sut] - ) = { + def canCreateNewSut(newState: State, initSuts: Traversable[State], runningSuts: Traversable[Sut]) = { !initSuts.exists(_.name == newState.name) && !runningSuts.exists(_.name == newState.name) } def newSut(state: State): Sut = Sut(state.name, null) - def destroySut(sut: Sut) = if(sut.db != null) sut.db.close + def destroySut(sut: Sut) = if (sut.db != null) sut.db.close def initialPreCondition(state: State) = !state.open @@ -57,13 +54,12 @@ object LevelDBSpec extends Commands { genGetExisting(state) ) - val genPut: Gen[Put] = Gen.resultOf(Put(_,_)) + val genPut: Gen[Put] = Gen.resultOf(Put(_, _)) def genPutExisting(state: State): Gen[Put] = for { key <- Gen.oneOf(state.contents.keys.toSeq) - value <- Gen.oneOf(arbitrary[List[Byte]], - Gen.const(state.contents(key))) - } yield Put(key,value) + value <- Gen.oneOf(arbitrary[List[Byte]], Gen.const(state.contents(key))) + } yield Put(key, value) val genGet: Gen[Get] = Gen.resultOf(Get(_)) diff --git a/examples/commands-nix/src/test/scala/CommandsNix.scala b/examples/commands-nix/src/test/scala/CommandsNix.scala index 7b760893..d4220177 100644 --- a/examples/commands-nix/src/test/scala/CommandsNix.scala +++ b/examples/commands-nix/src/test/scala/CommandsNix.scala @@ -1,7 +1,7 @@ import org.scalacheck.Gen import org.scalacheck.commands.Commands -import util.{Try,Success,Failure} +import util.{Try, Success, Failure} object CommandsNix extends org.scalacheck.Properties("CommandsNix") { @@ -13,14 +13,14 @@ object MachineSpec extends Commands { val con = new org.libvirt.Connect("qemu:///session") - def runSshCmd(ip: String, cmd: String): Either[String,String] = { + def runSshCmd(ip: String, cmd: String): Either[String, String] = { import scala.sys.process._ val err = new StringBuffer() val logger = ProcessLogger(err.append(_)) val sshcmd = s"ssh -q -i test-key_rsa -l root -o UserKnownHostsFile=/dev/null " + - s"-o StrictHostKeyChecking=no -o ConnectTimeout=1 ${ip}" + s"-o StrictHostKeyChecking=no -o ConnectTimeout=1 ${ip}" if (s"$sshcmd true" ! logger != 0) throw new Exception(err.toString) @@ -55,10 +55,10 @@ object MachineSpec extends Commands { prefixLength = 24; }; boot.kernelPackages = - pkgs.linuxPackages_${m.kernelVer.replace('.','_')}; + pkgs.linuxPackages_${m.kernelVer.replace('.', '_')}; """ - def toLibvirtXMLs(machines: State): Map[String,String] = { + def toLibvirtXMLs(machines: State): Map[String, String] = { import scala.sys.process._ import java.io.ByteArrayInputStream @@ -74,23 +74,23 @@ object MachineSpec extends Commands { // Check that all expected output files can be read xmlFiles.values foreach { f => - if(!(new java.io.File(f)).canRead) throw new Exception(raw""" + if (!(new java.io.File(f)).canRead) throw new Exception(raw""" No Libvirt XML produced (${f}) out = ${out.toString} err = ${err.toString} """) } - xmlFiles map { case (id,f) => id -> io.Source.fromFile(f).mkString } + xmlFiles map { case (id, f) => id -> io.Source.fromFile(f).mkString } } - case class Machine ( - id: String, - uuid: java.util.UUID, - ip: String, - kernelVer: String, - memory: Int, - running: Boolean + case class Machine( + id: String, + uuid: java.util.UUID, + ip: String, + kernelVer: String, + memory: Int, + running: Boolean ) // Machine.id mapped to a machine state @@ -100,12 +100,10 @@ object MachineSpec extends Commands { type Sut = Map[String, org.libvirt.Domain] // TODO we should check for example total amount of memory used here - def canCreateNewSut(newState: State, initSuts: Traversable[State], - runningSuts: Traversable[Sut] - ): Boolean = true + def canCreateNewSut(newState: State, initSuts: Traversable[State], runningSuts: Traversable[Sut]): Boolean = true def newSut(state: State): Sut = { - toLibvirtXMLs(state) map { case (id,xml) => id -> con.domainDefineXML(xml) } + toLibvirtXMLs(state) map { case (id, xml) => id -> con.domainDefineXML(xml) } } def destroySut(sut: Sut) = sut.values foreach { d => @@ -121,22 +119,22 @@ object MachineSpec extends Commands { // generate a 10.x.y subnet val genSubnet: Gen[List[Int]] = for { - x <- Gen.choose(0,255) - y <- Gen.choose(0,255) - } yield List(10,x,y) + x <- Gen.choose(0, 255) + y <- Gen.choose(0, 255) + } yield List(10, x, y) def hasDuplicates(xs: Seq[Any]): Boolean = xs.distinct.length != xs.length def genMachine(id: String, subnet: List[Int]): Gen[Machine] = for { uuid <- Gen.uuid - //ip <- Gen.choose(2,254).map(n => (subnet :+ n).mkString(".")) - ip <- Gen.choose(2,254).map(n => s"172.16.2.$n") + // ip <- Gen.choose(2,254).map(n => (subnet :+ n).mkString(".")) + ip <- Gen.choose(2, 254).map(n => s"172.16.2.$n") memory <- Gen.choose(96, 256) kernel <- Gen.oneOf("3.14", "3.13", "3.12", "3.10") - } yield Machine (id, uuid, ip, kernel, memory, false) + } yield Machine(id, uuid, ip, kernel, memory, false) val genInitialState: Gen[State] = for { - machineCount <- Gen.choose(5,5) + machineCount <- Gen.choose(5, 5) idGen = Gen.listOfN(8, Gen.alphaLowerChar).map(_.mkString) ids <- Gen.listOfN(machineCount, idGen) subnet <- genSubnet @@ -162,8 +160,8 @@ object MachineSpec extends Commands { ) def genCommand(state: State): Gen[Command] = - if(state.forall(!_.running)) genBoot(state) - else if(state.forall(_.running)) Gen.frequency( + if (state.forall(!_.running)) genBoot(state) + else if (state.forall(_.running)) Gen.frequency( (1, genShutdown(state)), (4, genPingOnline(state)) ) diff --git a/examples/commands-redis/src/test/scala/CommandsRedis.scala b/examples/commands-redis/src/test/scala/CommandsRedis.scala index c6e84efd..dd1daabb 100644 --- a/examples/commands-redis/src/test/scala/CommandsRedis.scala +++ b/examples/commands-redis/src/test/scala/CommandsRedis.scala @@ -1,6 +1,5 @@ import org.scalacheck.Gen -import org.scalacheck.Gen.{someOf, oneOf, const, nonEmptyListOf, - identifier, frequency} +import org.scalacheck.Gen.{someOf, oneOf, const, nonEmptyListOf, identifier, frequency} import org.scalacheck.Arbitrary.arbitrary import org.scalacheck.commands.Commands @@ -10,7 +9,6 @@ import scala.collection.Seq import com.redis.RedisClient - object CommandsRedis extends org.scalacheck.Properties("CommandsRedis") { property("redisspec") = RedisSpec.property() @@ -21,15 +19,13 @@ object RedisSpec extends Commands { type Sut = RedisClient - case class State ( - contents: collection.immutable.Map[String,String], - deleted: collection.immutable.Set[String], - connected: Boolean + case class State( + contents: collection.immutable.Map[String, String], + deleted: collection.immutable.Set[String], + connected: Boolean ) - def canCreateNewSut(newState: State, initSuts: Traversable[State], - runningSuts: Traversable[Sut] - ): Boolean = { + def canCreateNewSut(newState: State, initSuts: Traversable[State], runningSuts: Traversable[Sut]): Boolean = { initSuts.isEmpty && runningSuts.isEmpty } @@ -55,7 +51,7 @@ object RedisSpec extends Commands { ) def genCommand(state: State): Gen[Command] = { - if(!state.connected) ToggleConnected + if (!state.connected) ToggleConnected else frequency( (20, genDel), @@ -66,13 +62,13 @@ object RedisSpec extends Commands { (20, genGetExisting(state)), (20, genGetDeleted(state)), (20, const(DBSize)), - ( 1, const(FlushDB)), - ( 3, const(ToggleConnected)) + (1, const(FlushDB)), + (3, const(ToggleConnected)) ) } - //val genKey = arbitrary[String] - //val genVal = arbitrary[String] + // val genKey = arbitrary[String] + // val genVal = arbitrary[String] val genKey = identifier val genVal = identifier @@ -82,30 +78,32 @@ object RedisSpec extends Commands { } yield Set(key, value) def genDelExisting(state: State): Gen[Del] = - if(state.contents.isEmpty) genDel + if (state.contents.isEmpty) genDel else someOf(state.contents.keys.toSeq).map(Del.apply) def genSetExisting(state: State): Gen[Set] = - if(state.contents.isEmpty) genSet else for { + if (state.contents.isEmpty) genSet + else for { key <- oneOf(state.contents.keys.toSeq) value <- oneOf(genVal, const(state.contents(key))) - } yield Set(key,value) + } yield Set(key, value) val genGet: Gen[Get] = genKey.map(Get.apply) val genDel: Gen[Del] = nonEmptyListOf(genKey).map(Del.apply) def genGetExisting(state: State): Gen[Get] = - if(state.contents.isEmpty) genGet else for { + if (state.contents.isEmpty) genGet + else for { key <- oneOf(state.contents.keys.toSeq) } yield Get(key) def genGetDeleted(state: State): Gen[Get] = - if(state.deleted.isEmpty) genGet else for { + if (state.deleted.isEmpty) genGet + else for { key <- oneOf(state.deleted.toSeq) } yield Get(key) - case object DBSize extends Command { type Result = Option[Long] def run(sut: Sut) = sut.dbsize @@ -130,7 +128,7 @@ object RedisSpec extends Commands { case class Del(keys: Seq[String]) extends Command { type Result = Option[Long] def run(sut: Sut) = - if(keys.isEmpty) Some(0) + if (keys.isEmpty) Some(0) else sut.del(keys.head, keys.tail.toSeq: _*) def preCondition(state: State) = state.connected def nextState(state: State) = state.copy( @@ -155,7 +153,7 @@ object RedisSpec extends Commands { case object ToggleConnected extends Command { type Result = Boolean def run(sut: Sut) = { - if(sut.connected) sut.quit + if (sut.connected) sut.quit else sut.connect } def preCondition(state: State) = true diff --git a/examples/scalajs/project/plugins.sbt b/examples/scalajs/project/plugins.sbt index 48139835..5c16d202 100644 --- a/examples/scalajs/project/plugins.sbt +++ b/examples/scalajs/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") - diff --git a/examples/simple-sbt/build.sbt b/examples/simple-sbt/build.sbt index 14864de7..8c6397dd 100644 --- a/examples/simple-sbt/build.sbt +++ b/examples/simple-sbt/build.sbt @@ -4,4 +4,13 @@ scalaVersion := "3.1.0" libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.15.4" % Test -Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-maxSize", "5", "-minSuccessfulTests", "33", "-workers", "1", "-verbosity", "1") +Test / testOptions += Tests.Argument( + TestFrameworks.ScalaCheck, + "-maxSize", + "5", + "-minSuccessfulTests", + "33", + "-workers", + "1", + "-verbosity", + "1") From db7c81982b63840e57a0ae172c439a07d1ab932f Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 00:25:30 +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 3d446918..5c2e52ad 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,3 +5,6 @@ b8564609df3c849b3a258a411e0de645d4e8c7a0 # Code formatting (PR: #950) ccd98e22a078e1282dbb2c1acfb40fe3afee01b6 + +# Scala Steward: Reformat with scalafmt 3.7.6 +79da8216cac0c6ec8b2d6340c1980674fdd273aa