Skip to content

Commit 4db5d8e

Browse files
ColOfAbRiXq-fabriziocolonna
authored andcommitted
Minor cleanups
1 parent 7116dee commit 4db5d8e

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

figlet4s-core/src/main/scala-2.13/com/colofabrix/scala/figlet4s/compat.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.colofabrix.scala.figlet4s
22

3+
import cats.implicits._
34
import com.colofabrix.scala.figlet4s.errors._
45
import java.math.BigInteger
56
import java.nio.charset.Charset
@@ -54,8 +55,6 @@ private[figlet4s] object compat {
5455
}
5556
}
5657

57-
import cats.implicits._
58-
5958
/**
6059
* Validated extension methods for Scala 2.13
6160
*/

figlet4s-core/src/main/scala-3/com/colofabrix/scala/figlet4s/compat.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.colofabrix.scala.figlet4s
22

3+
import cats.data.*
4+
import cats.implicits.*
35
import com.colofabrix.scala.figlet4s.errors.*
46
import java.math.BigInteger
57
import java.nio.charset.Charset
@@ -55,9 +57,6 @@ private[figlet4s] object compat {
5557

5658
}
5759

58-
import cats.implicits.*
59-
import cats.data.*
60-
6160
/**
6261
* Validated extension methods for Scala 3
6362
*/

figlet4s-core/src/main/scala/com/colofabrix/scala/figlet4s/rendering/Rendering.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,16 @@ final private[rendering] class Rendering(options: RenderOptions) {
124124
@tailrec
125125
private def appendLoop(figures: Vector[Columns], partial: Vector[Columns], state: AppendLoopState): Vector[Columns] =
126126
(figures, partial) match {
127-
case (Vector(), _) => partial
127+
case (Vector(), _) =>
128+
partial
128129
case (figChar +: remainingChars, upperLines :+ lastLine) =>
129130
val merged = merge(MergeLoopState(lastLine, figChar, appendLoopState = state))
130131
def onBorder = merge(MergeLoopState(b = figChar))
131132
val result = if (merged.lengthIs <= options.maxWidth) upperLines :+ merged else partial :+ onBorder
132133
val nextState = state.copy(lastCharWidth = figChar.length)
133134
appendLoop(remainingChars, result, nextState)
134-
case _ => partial // Fallback case (should never happen as partial is never empty)
135+
case _ =>
136+
partial
135137
}
136138

137139
// ---- //

project/TestDependencies.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ object TestDependencies {
2626
s"scalacheck-$major-$minor"
2727
}
2828

29-
// CatsScalaTestDep is defined as a function due to version differences
3029
def catsScalaTestDep(scalaVersion: String): ModuleID = {
3130
val version = if (scalaVersion.startsWith("2.")) CatsScalaTestVersion2 else CatsScalaTestVersion3
3231
"com.ironcorelabs" %% "cats-scalatest" % version % "test,it"

project/build.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import SbtPluginsDeps._
33
import PublishDependencies._
44

55
// Resolve version conflicts
6-
ThisBuild / libraryDependencySchemes ++= Seq(
7-
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
8-
)
6+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
97

108
// Add all dependencies
119
sbtPlugins.map(addSbtPlugin)

0 commit comments

Comments
 (0)