Merge pull request #9230 from mhashizume/maint/main/new-performance-cops

Fix performance cops

Author: tvpartytonight

lib/puppet/environments.rb

@@ -269,9 +269,9 @@ def validated_directory(envdir)
     def valid_environment_names
       return [] unless Puppet::FileSystem.directory?(@environment_dir)
 
-      Puppet::FileSystem.children(@environment_dir).map do |child|
+      Puppet::FileSystem.children(@environment_dir).filter_map do |child|
         Puppet::FileSystem.basename_string(child).intern if validated_directory(child)
-      end.compact
+      end
     end
   end
 

lib/puppet/external/dot.rb

@@ -208,10 +208,10 @@ def to_s(t = '')
             t + $tab + '"' + "\n"
 
       t + "#{@name} [\n" +
-        @options.to_a.collect { |i|
+        @options.to_a.filter_map { |i|
           i[1] && i[0] != 'label' ?
             t + $tab + "#{i[0]} = #{i[1]}" : nil
-        }.compact.join(",\n") + (label != '' ? ",\n" : "\n") +
+        }.join(",\n") + (label != '' ? ",\n" : "\n") +
         label +
         t + "]\n"
     end
@@ -252,11 +252,11 @@ def pop
     def to_s(t = '')
       hdr = t + "#{@dot_string} #{@name} {\n"
 
-      options = @options.to_a.collect { |name, val|
+      options = @options.to_a.filter_map { |name, val|
         val && name != 'label' ?
           t + $tab + "#{name} = #{val}" :
           name ? t + $tab + "#{name} = \"#{val}\"" : nil
-      }.compact.join("\n") + "\n"
+      }.join("\n") + "\n"
 
       nodes = @nodes.collect { |i|
         i.to_s(t + $tab)
@@ -291,11 +291,11 @@ def edge_link
 
     def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
-        @options.to_a.collect { |i|
+        @options.to_a.filter_map { |i|
           i[1] && i[0] != 'label' ?
             t + $tab + "#{i[0]} = #{i[1]}" :
             i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
-        }.compact.join("\n") + "\n#{t}]\n"
+        }.join("\n") + "\n#{t}]\n"
     end
   end
 

lib/puppet/face/module/list.rb

@@ -211,7 +211,7 @@ def warn_unmet_dependencies(environment)
   #     └── puppetlabs-sqlite (v0.0.1)
   #
   def list_build_tree(list, ancestors = [], parent = nil, params = {})
-    list.map do |mod|
+    list.filter_map do |mod|
       next if @seen[(mod.forge_name or mod.name)]
 
       node = list_build_node(mod, parent, params)
@@ -232,7 +232,7 @@ def list_build_tree(list, ancestors = [], parent = nil, params = {})
       end
 
       node
-    end.compact
+    end
   end
 
   # Prepare a module object for print in a tree view.  Each node in the tree

lib/puppet/module_tool.rb

@@ -103,7 +103,7 @@ def self.build_tree(mods, dir)
         mod[:text] += " [#{mod[:path]}]" unless mod[:path].to_s == dir.to_s
 
         deps = (mod[:dependencies] || [])
-        deps.sort! { |a, b| a[:name] <=> b[:name] }
+        deps.sort_by! { |a| a[:name] }
         build_tree(deps, dir)
       end
     end

lib/puppet/module_tool/applications/upgrader.rb

@@ -257,7 +257,7 @@ def build_install_graph(release, installed, graphed = [])
 
         graphed << release
 
-        dependencies = release.dependencies.values.map do |deps|
+        dependencies = release.dependencies.values.filter_map do |deps|
           dep = (deps & installed).first
           if dep == installed_modules[dep.name]
             next
@@ -266,7 +266,7 @@ def build_install_graph(release, installed, graphed = [])
           if dep && !graphed.include?(dep)
             build_install_graph(dep, installed, graphed)
           end
-        end.compact
+        end
 
         return {
           :release => release,

lib/puppet/module_tool/shared_behaviors.rb

@@ -39,7 +39,7 @@ def get_remote_constraints(forge)
       releases.each do |rel|
         semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
-        @versions[mod_name].sort! { |a, b| a[:semver] <=> b[:semver] }
+        @versions[mod_name].sort_by! { |a| a[:semver] }
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
@@ -67,7 +67,7 @@ def annotated_version(mod, versions)
   end
 
   def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, action = @action)
-    dependencies = dependencies.map do |mod, range|
+    dependencies = dependencies.filter_map do |mod, range|
       source.last[:dependency] = range
 
       @conditions[mod] << {
@@ -138,7 +138,7 @@ def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, a
         :path => action == :install ? @options[:target_dir] : (@installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath),
         :dependencies => []
       }
-    end.compact
+    end
     dependencies.each do |mod|
       deps = @remote["#{mod[:module]}@#{mod[:version][:vstring]}"].sort_by(&:first)
       mod[:dependencies] = resolve_constraints(deps, source + [{ :name => mod[:module], :version => mod[:version][:vstring] }], seen, :install)

lib/puppet/network/format_handler.rb

@@ -86,13 +86,13 @@ def self.format_to_canonical_name(format)
   def self.most_suitable_formats_for(accepted, supported)
     accepted.collect do |format|
       format.to_s.sub(/;q=.*$/, '')
-    end.collect do |format|
+    end.filter_map do |format|
       if format == ALL_MEDIA_TYPES
         supported.first
       else
         format_to_canonical_name_or_nil(format)
       end
-    end.compact.find_all do |format|
+    end.find_all do |format|
       supported.include?(format)
     end.collect do |format|
       format_for(format)

lib/puppet/network/http/handler.rb

@@ -19,7 +19,7 @@ def register(routes)
     # There's got to be a simpler way to do this, right?
     dupes = {}
     routes.each { |r| dupes[r.path_matcher] = (dupes[r.path_matcher] || 0) + 1 }
-    dupes = dupes.collect { |pm, count| pm if count > 1 }.compact
+    dupes = dupes.filter_map { |pm, count| pm if count > 1 }
     if dupes.count > 0
       raise ArgumentError, _("Given multiple routes with identical path regexes: %{regexes}") % { regexes: dupes.map { |rgx| rgx.inspect }.join(', ') }
     end

lib/puppet/node/environment.rb

@@ -365,14 +365,14 @@ def modules
         end
       end
 
-      @modules = module_references.collect do |reference|
+      @modules = module_references.filter_map do |reference|
         begin
           Puppet::Module.new(reference[:name], reference[:path], self)
         rescue Puppet::Module::Error => e
           Puppet.log_exception(e)
           nil
         end
-      end.compact
+      end
     end
     @modules
   end

lib/puppet/parser/functions/create_resources.rb

@@ -100,15 +100,15 @@
       virtual, exported,
       type_name,
       resource_titles,
-      defaults.merge(params).map do |name, value|
+      defaults.merge(params).filter_map do |name, value|
         value = nil if value == :undef
         Puppet::Parser::Resource::Param.new(
           :name => name,
           :value => value, # wide open to various data types, must be correct
           :source => self.source, # TODO: support :line => line, :file => file,
           :add => false
         )
-      end.compact
+      end
     )
   end.flatten.compact
 end