let filter_out_descendants do less passes

Whatever the inner loop selects, we already know is a descendant and
can be filtered out right away from dirs_sorted_by_nparts to skip
useless iterations.

1 files changed, 9 insertions, 9 deletions

diff --git a/activesupport/lib/active_support/file_evented_update_checker.rb b/activesupport/lib/active_support/file_evented_update_checker.rb
index 9c66363e9f..5e5874c014 100644
--- a/activesupport/lib/active_support/file_evented_update_checker.rb
+++ b/activesupport/lib/active_support/file_evented_update_checker.rb
@@ -130,22 +130,22 @@ module ActiveSupport
       end
 
       # Filters out directories which are descendants of others in the collection (stable).
-      def filter_out_descendants(directories)
-        return directories if directories.length < 2
+      def filter_out_descendants(dirs)
+        return dirs if dirs.length < 2
 
-        sorted_by_nparts = directories.sort_by { |dir| dir.each_filename.to_a.length }
+        dirs_sorted_by_nparts = dirs.sort_by { |dir| dir.each_filename.to_a.length }
         descendants = []
 
-        until sorted_by_nparts.empty?
-          dir = sorted_by_nparts.shift
+        until dirs_sorted_by_nparts.empty?
+          dir = dirs_sorted_by_nparts.shift
 
-          descendants.concat sorted_by_nparts.select { |possible_descendant|
-            dir.ascendant_of?(possible_descendant)
-          }
+          dirs_sorted_by_nparts.reject! do |possible_descendant|
+            dir.ascendant_of?(possible_descendant) && descendants << possible_descendant
+          end
         end
 
         # Array#- preserves order.
-        directories - descendants
+        dirs - descendants
       end
     end
   end