fix some deprecation warnings

joernio · Apr 25, 2024 · 739a6a9 · 739a6a9
1 parent 2f59dd6
commit 739a6a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/core/src/test/scala/flatgraph/traversal/RepeatTraversalTests.scala b/core/src/test/scala/flatgraph/traversal/RepeatTraversalTests.scala
@@ -233,7 +233,7 @@ class RepeatTraversalTests extends AnyWordSpec with ExampleGraphSetup {
   "traverses all nodes to outer limits exactly once, emitting and returning nothing, by default" in {
     val traversedNodes = mutable.ListBuffer.empty[Any]
 
-    def test(traverse: => Iterable[_]) = {
+    def test(traverse: => Iterable[?]) = {
       traversedNodes.clear()
       val results = traverse
       traversedNodes.size shouldBe 9

diff --git a/formats/src/test/scala/flatgraph/testutils/ProjectRoot.scala b/formats/src/test/scala/flatgraph/testutils/ProjectRoot.scala
@@ -12,7 +12,7 @@ import java.nio.file.{Files, Paths}
   */
 object ProjectRoot {
 
-  private val SEARCH_DEPTH = 6
+  private val MaxSearchDepth = 6
   object SearchDepthExceededError extends Error
 
   def relativise(path: String): String =
@@ -21,15 +21,16 @@ object ProjectRoot {
   def findRelativePath: String = {
     val fileThatOnlyExistsInRoot = ".git"
 
-    for (depth <- 0 to SEARCH_DEPTH) {
-      val pathPrefix = "./" + "../" * depth
-
-      if (Files.exists(Paths.get(s"$pathPrefix$fileThatOnlyExistsInRoot"))) {
-        return pathPrefix
-      }
+    var currentDepth     = 0
+    var currentAttempt   = "./"
+    def foundIt: Boolean = Files.exists(Paths.get(s"$currentAttempt$fileThatOnlyExistsInRoot"))
+    while (!foundIt && currentDepth < MaxSearchDepth) {
+      currentAttempt += "../"
+      currentDepth += 1
     }
 
-    throw SearchDepthExceededError
+    if (foundIt) currentAttempt
+    else throw SearchDepthExceededError
   }
 
 }