Skip to content

Commit 9c8649a

Browse files
authored
Merge pull request #268 from hnaderi/update/scalafmt-core-3.9.10
Update scalafmt-core to 3.9.10
2 parents ccc1bc3 + e56b009 commit 9c8649a

5 files changed

Lines changed: 15 additions & 13 deletions

File tree

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.9.10
2+
6f9b63a46fc0629af59cc9a4dfd32a26dccdb542

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = 3.9.4
1+
version = 3.9.10
22
runner.dialect = scala212source3

modules/jsyaml/src/main/scala/JSYaml.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ private[yaml4s] trait JSYaml extends YamlBackend {
3939
private[this] def convertAnyToJsonUnsafe[T](
4040
input: Any
4141
)(implicit w: Writer[T]): T = input match {
42-
case s: String => w.ystring(s)
43-
case n: Double => w.ydouble(n)
44-
case true => w.ytrue
45-
case false => w.yfalse
46-
case null => w.ynull
42+
case s: String => w.ystring(s)
43+
case n: Double => w.ydouble(n)
44+
case true => w.ytrue
45+
case false => w.yfalse
46+
case null => w.ynull
4747
case a: js.Array[?] =>
4848
w.yarray(a.map(convertAnyToJsonUnsafe[T](_)).toList)
4949
case o: js.Object =>

modules/libyaml/src/main/scala/LibyamlParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private[yaml4s] trait LibyamlParser extends Parser {
7474
doc.clean()
7575

7676
t match {
77-
case None => Right(result)
77+
case None => Right(result)
7878
case Some(value) =>
7979
result.append(value)
8080
go()

modules/snake/src/main/scala/SnakeParser.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private[yaml4s] trait SnakeParser extends Parser {
7979
val composer = createComposer(reader)
8080
asScala(composer.getSingleNode)
8181
} match {
82-
case Left(err) => Left(ParsingFailure(err.getMessage, err))
82+
case Left(err) => Left(ParsingFailure(err.getMessage, err))
8383
case Right(None) =>
8484
Left(
8585
ParsingFailure(
@@ -128,8 +128,8 @@ private[yaml4s] trait SnakeParser extends Parser {
128128
case Tag.INT
129129
if node.getValue.startsWith("0x") || node.getValue.contains("_") =>
130130
flattener.construct(node) match {
131-
case int: Integer => w.yint(int)
132-
case long: java.lang.Long => w.ylong(long)
131+
case int: Integer => w.yint(int)
132+
case long: java.lang.Long => w.ylong(long)
133133
case bigint: java.math.BigInteger =>
134134
w.ybigdecimal(BigDecimal(bigint))
135135
case other =>
@@ -145,12 +145,12 @@ private[yaml4s] trait SnakeParser extends Parser {
145145
case Tag.BOOL =>
146146
flattener.construct(node) match {
147147
case b: java.lang.Boolean => w.ybool(b)
148-
case _ =>
148+
case _ =>
149149
throw new IllegalArgumentException(
150150
s"Invalid boolean string ${node.getValue}"
151151
)
152152
}
153-
case Tag.NULL => w.ynull
153+
case Tag.NULL => w.ynull
154154
case CustomTag(other) =>
155155
w.yobject(Seq(other.stripPrefix("!") -> w.ystring(node.getValue)))
156156
case _ => w.ystring(node.getValue)
@@ -161,7 +161,7 @@ private[yaml4s] trait SnakeParser extends Parser {
161161

162162
def convertKeyNode(node: Node) = node match {
163163
case scalar: ScalarNode => Right(scalar.getValue)
164-
case _ =>
164+
case _ =>
165165
Left(
166166
ParsingFailure("Only string keys can be represented in JSON", null)
167167
)

0 commit comments

Comments
 (0)