Skip to content

Commit 352d9f7

Browse files
committed
Misc fixes
1 parent bde0be8 commit 352d9f7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

rules/scalafmt/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ scala_binary(
5555
"//src/main/scala/higherkindness/rules_scala/common/worker",
5656
"//src/main/scala/higherkindness/rules_scala/workers/common",
5757
"@annex//:net_sourceforge_argparse4j_argparse4j",
58-
"@annex_scalafmt//:com_geirsson_metaconfig_core_2_13",
58+
"@annex_scalafmt//:org_scalameta_metaconfig_core_2_13",
5959
"@annex_scalafmt//:org_scalameta_parsers_2_13",
6060
"@annex_scalafmt//:org_scalameta_scalafmt_core_2_13",
6161
],

rules/scalafmt/scalafmt/ScalafmtRunner.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ object ScalafmtRunner extends WorkerMain[Unit] {
6868
} catch {
6969
case e @ (_: org.scalafmt.Error | _: scala.meta.parsers.ParseException) => {
7070
if (config.runner.fatalWarnings) {
71-
System.err.println(Color.Error("Exception thrown by Scalafmt and fatalWarnings is enabled"))
71+
task.out.println(Color.Error("Exception thrown by Scalafmt and fatalWarnings is enabled"))
7272
throw e
7373
} else {
74-
System.err.println(Color.Warning("Unable to format file due to bug in scalafmt"))
75-
System.err.println(Color.Warning(e.toString))
74+
task.out.println(Color.Warning("Unable to format file due to bug in scalafmt"))
75+
task.out.println(Color.Warning(e.toString))
7676
source
7777
}
7878
}

src/main/scala/higherkindness/rules_scala/workers/deps/DepsRunner.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,10 @@ object DepsRunner extends WorkerMain[Unit] {
173173
(usedPaths -- (workRequest.directDepLabels :++ workRequest.unusedDepWhitelist).flatMap(pathsForLabel))
174174
.flatMap { path =>
175175
groupLabelToJarPaths.collectFirst { case (myLabel, paths) if paths(path) => myLabel }.orElse {
176-
System.err
177-
.println(s"Warning: There is a reference to $path, but no dependency of ${workRequest.label} provides it")
176+
task.out
177+
.println(
178+
s"Warning: There is a reference to $path, but no dependency of ${workRequest.label} provides it",
179+
)
178180
None
179181
}
180182
}

0 commit comments

Comments
 (0)