Skip to content

Commit a23a379

Browse files
committed
Reformat with scalafmt 3.7.12
Executed command: scalafmt --non-interactive
1 parent d624f62 commit a23a379

File tree

8 files changed

+40
-27
lines changed

8 files changed

+40
-27
lines changed

build.sc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val acyclic = "0.3.8"
1616
val scalaVersions = List(scala212, scala213, scala3)
1717

1818
trait MainArgsPublishModule
19-
extends PublishModule
19+
extends PublishModule
2020
with CrossScalaModule
2121
with Mima
2222
with PlatformScalaModule {
@@ -25,7 +25,6 @@ trait MainArgsPublishModule
2525

2626
override def mimaPreviousVersions = Seq("0.5.0")
2727

28-
2928
override def versionScheme: T[Option[VersionScheme]] = T(Some(VersionScheme.EarlySemVer))
3029

3130
def pomSettings = PomSettings(
@@ -41,18 +40,18 @@ trait MainArgsPublishModule
4140

4241
def scalacOptions =
4342
super.scalacOptions() ++
44-
Option.when(!isScala3(scalaVersion()))("-P:acyclic:force")
43+
Option.when(!isScala3(scalaVersion()))("-P:acyclic:force")
4544

4645
def scalacPluginIvyDeps =
4746
super.scalacPluginIvyDeps() ++
48-
Option.when(!isScala3(scalaVersion()))(ivy"com.lihaoyi:::acyclic:${acyclic}")
47+
Option.when(!isScala3(scalaVersion()))(ivy"com.lihaoyi:::acyclic:${acyclic}")
4948

5049
def compileIvyDeps =
5150
super.compileIvyDeps() ++
52-
Agg.when(!isScala3(crossScalaVersion))(
53-
ivy"com.lihaoyi:::acyclic:${acyclic}",
54-
ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
55-
)
51+
Agg.when(!isScala3(crossScalaVersion))(
52+
ivy"com.lihaoyi:::acyclic:${acyclic}",
53+
ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
54+
)
5655

5756
def ivyDeps = Agg(
5857
ivy"org.scala-lang.modules::scala-collection-compat::2.8.1"

mainargs/src/Invoker.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ object Invoker {
3131
Right(ParamResult.Success(Flag(kvs.contains(a)).asInstanceOf[T]))
3232
case r: TokensReader.Simple[T] => Right(makeReadCall(kvs, base, a, r))
3333
case r: TokensReader.Constant[T] => Right(r.read() match {
34-
case Left(s) => ParamResult.Failure(Seq(Result.ParamError.Failed(a, Nil, s)))
35-
case Right(v) => ParamResult.Success(v)
36-
})
34+
case Left(s) => ParamResult.Failure(Seq(Result.ParamError.Failed(a, Nil, s)))
35+
case Right(v) => ParamResult.Success(v)
36+
})
3737
case r: TokensReader.Leftover[T, _] => Right(makeReadVarargsCall(a, extras, r))
3838
case r: TokensReader.Class[T] =>
3939
Left(

mainargs/src/TokenGrouping.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ object TokenGrouping {
7676

7777
val missing = argSigs.collect {
7878
case (a, r: TokensReader.Simple[_])
79-
if !r.allowEmpty
80-
&& a.default.isEmpty
81-
&& !current.contains(a) =>
82-
a
79+
if !r.allowEmpty
80+
&& a.default.isEmpty
81+
&& !current.contains(a) =>
82+
a
8383
}
8484

8585
val unknown = if (allowLeftover) Nil else remaining

mainargs/src/TokensReader.scala

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ object TokensReader {
2222
sealed trait Terminal[T] extends TokensReader[T]
2323

2424
sealed trait ShortNamed[T] extends Terminal[T] {
25+
2526
/**
2627
* The label that shows up in the CLI help message, e.g. the `bar` in
2728
* `--foo <bar>`
@@ -34,6 +35,7 @@ object TokensReader {
3435
* e.g. `--foo bar`
3536
*/
3637
trait Simple[T] extends ShortNamed[T] {
38+
3739
/**
3840
* Converts the given input tokens to a [[T]] or an error `String`.
3941
* The input is a `Seq` because input tokens can be passed more than once,
@@ -132,15 +134,16 @@ object TokensReader {
132134
def read(strs: Seq[String]) = tryEither(strs.last.toDouble)
133135
}
134136

135-
implicit def LeftoverRead[T: TokensReader.Simple]: TokensReader.Leftover[mainargs.Leftover[T], T] =
137+
implicit def LeftoverRead[T: TokensReader.Simple]
138+
: TokensReader.Leftover[mainargs.Leftover[T], T] =
136139
new LeftoverRead[T]()(implicitly[TokensReader.Simple[T]])
137140

138141
class LeftoverRead[T](implicit wrapped: TokensReader.Simple[T])
139142
extends Leftover[mainargs.Leftover[T], T] {
140143
def read(strs: Seq[String]) = {
141144
val (failures, successes) = strs
142145
.map(s =>
143-
implicitly[TokensReader[T]] match{
146+
implicitly[TokensReader[T]] match {
144147
case r: TokensReader.Simple[T] => r.read(Seq(s))
145148
case r: TokensReader.Leftover[T, _] => r.read(Seq(s))
146149
}
@@ -221,8 +224,9 @@ object TokensReader {
221224
}
222225

223226
object ArgSig {
224-
def create[T, B](name0: String, arg: mainargs.arg, defaultOpt: Option[B => T])
225-
(implicit tokensReader: TokensReader[T]): ArgSig = {
227+
def create[T, B](name0: String, arg: mainargs.arg, defaultOpt: Option[B => T])(implicit
228+
tokensReader: TokensReader[T]
229+
): ArgSig = {
226230
val nameOpt = scala.Option(arg.name).orElse(if (name0.length == 1 || arg.noDefaultName) None
227231
else Some(name0))
228232
val shortOpt = arg.short match {
@@ -285,7 +289,7 @@ case class MainData[T, B](
285289
argSigs0.iterator.flatMap[(ArgSig, TokensReader.Terminal[_])](ArgSig.flatten(_)).toVector
286290

287291
val renderedArgSigs: Seq[ArgSig] =
288-
flattenedArgSigs.collect{case (a, r) if !a.hidden && !r.isConstant => a}
292+
flattenedArgSigs.collect { case (a, r) if !a.hidden && !r.isConstant => a }
289293
}
290294

291295
object MainData {

mainargs/test/src-jvm-2/AmmoniteTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ object AmmoniteConfig {
3131
case class InjectedConstant()
3232

3333
implicit object InjectedTokensReader extends TokensReader.Constant[InjectedConstant] {
34-
def read() = Right(new InjectedConstant())
35-
}
34+
def read() = Right(new InjectedConstant())
35+
}
3636
@main
3737
case class Core(
3838
injectedConstant: InjectedConstant,

mainargs/test/src/ConstantTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object ConstantTests extends TestSuite {
55

66
case class Injected()
77
implicit def InjectedTokensReader: TokensReader.Constant[Injected] =
8-
new TokensReader.Constant[Injected]{
8+
new TokensReader.Constant[Injected] {
99
def read() = Right(new Injected())
1010
}
1111
object Base {

mainargs/test/src/CoreTests.scala

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,15 @@ object CorePositionalDisabledOnlyTests extends TestSuite {
219219
test("redundantParams") - check(
220220
List("qux", "1", "-i", "2"),
221221
MismatchedArguments(
222-
missing = List(ArgSig(None, Some('i'), None, None, TokensReader.IntRead, positional = false, hidden = false)),
222+
missing = List(ArgSig(
223+
None,
224+
Some('i'),
225+
None,
226+
None,
227+
TokensReader.IntRead,
228+
positional = false,
229+
hidden = false
230+
)),
223231
unknown = List("1", "-i", "2")
224232
)
225233
)

mainargs/test/src/IssueTests.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ object IssueTests extends TestSuite {
55

66
object Main {
77
@main
8-
def mycmd(@arg(name = "the-flag") f: mainargs.Flag = mainargs.Flag(false),
9-
@arg str: String = "s",
10-
args: Leftover[String]) = {
8+
def mycmd(
9+
@arg(name = "the-flag") f: mainargs.Flag = mainargs.Flag(false),
10+
@arg str: String = "s",
11+
args: Leftover[String]
12+
) = {
1113
(f.value, str, args.value)
1214
}
1315
}

0 commit comments

Comments
 (0)