Standardize breadth-first loops

fxn · May 12, 2024 · d07be7d · d07be7d
1 parent 33fe4a2
commit d07be7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/zeitwerk/loader/eager_load.rb b/lib/zeitwerk/loader/eager_load.rb
@@ -165,8 +165,8 @@ def load_file(path)
     log("eager load directory #{dir} start") if logger
 
     queue = [[dir, namespace]]
-    while to_eager_load = queue.shift
-      dir, namespace = to_eager_load
+    until queue.empty?
+      dir, namespace = queue.shift
 
       ls(dir) do |basename, abspath|
         next if honour_exclusions && eager_load_exclusions.member?(abspath)
@@ -210,7 +210,9 @@ def load_file(path)
     next_dirs = []
 
     suffix.split("::").each do |segment|
-      while dir = dirs.shift
+      until dirs.empty?
+        dir = dirs.shift
+
         ls(dir) do |basename, abspath|
           next unless dir?(abspath)
 

diff --git a/lib/zeitwerk/loader/helpers.rb b/lib/zeitwerk/loader/helpers.rb
@@ -45,7 +45,9 @@ module Zeitwerk::Loader::Helpers
   private def has_at_least_one_ruby_file?(dir)
     to_visit = [dir]
 
-    while dir = to_visit.shift
+    until to_visit.empty?
+      dir = to_visit.shift
+
       ls(dir) do |_basename, abspath|
         if dir?(abspath)
           to_visit << abspath