updated to newer Scala 3 syntax with fewer braces

Signed-off-by: Konstantin Läufer <[email protected]>
LoyolaChicagoCode · Oct 1, 2023 · c050348 · c050348
1 parent 33c2ba0
commit c050348
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/main/scala/functional/modular/common.scala b/src/main/scala/functional/modular/common.scala
@@ -13,5 +13,7 @@ def runWithStdIO[Result](run: Task[String, Result], args: Array[String]): Unit =
   val result = run(lines, args)
   result
     // terminate on I/O error such as SIGPIPE
-    .takeWhile { _ => !scala.sys.process.stdout.checkError() }
-    .foreach { r => println(r) }
+    .takeWhile: _ =>
+      !scala.sys.process.stdout.checkError()
+    .foreach: r =>
+      println(r)
diff --git a/src/main/scala/functional/simple/CumAvgFunctional.scala b/src/main/scala/functional/simple/CumAvgFunctional.scala
@@ -17,6 +17,8 @@ object CumAvgFunctional:
     countsWithAvgs
       .drop(1)
       // terminate on I/O error such as SIGPIPE
-      .takeWhile { _ => !scala.sys.process.stdout.checkError() }
-      .foreach { (count, avg) => println(s"$count: $avg") }
+      .takeWhile: _ =>
+        !scala.sys.process.stdout.checkError()
+      .foreach: (count, avg) =>
+        println(s"$count: $avg")
 end CumAvgFunctional
diff --git a/src/main/scala/functional/simple/CumulativeLengthFunctional.scala b/src/main/scala/functional/simple/CumulativeLengthFunctional.scala
@@ -11,6 +11,8 @@ object CumulativeLengthFunctional:
 
     results
       // terminate on I/O error such as SIGPIPE
-      .takeWhile { _ => !scala.sys.process.stdout.checkError() }
-      .foreach { r => println(r) }
+      .takeWhile: _ => 
+        !scala.sys.process.stdout.checkError()
+      .foreach: r => 
+        println(r)
 end CumulativeLengthFunctional
diff --git a/src/main/scala/functional/simple/LineCountFunctional.scala b/src/main/scala/functional/simple/LineCountFunctional.scala
@@ -10,6 +10,8 @@ object LineCountFunctional:
 
     results
       // terminate on I/O error such as SIGPIPE
-      .takeWhile { r => !scala.sys.process.stdout.checkError() }
-      .foreach { r => println(r) }
+      .takeWhile: r => 
+        !scala.sys.process.stdout.checkError()
+      .foreach: r => 
+        println(r)
 end LineCountFunctional
diff --git a/src/main/scala/functional/simple/TemperatureConversion.scala b/src/main/scala/functional/simple/TemperatureConversion.scala
@@ -9,6 +9,8 @@ object TemperatureConversion:
 
     results
       // terminate on I/O error such as SIGPIPE
-      .takeWhile { _ => !scala.sys.process.stdout.checkError() }
-      .foreach { r => println(r) }
+      .takeWhile: _ =>
+        !scala.sys.process.stdout.checkError()
+      .foreach: r =>
+        println(r)
 end TemperatureConversion