Merge pull request #4617 from chef/lcg/chefstyle-perf

Autofixing new Perf cops in 0.37.2

4 files changed, 6 insertions, 5 deletions

diff --git a/lib/chef/http/authenticator.rb b/lib/chef/http/authenticator.rb
index b5e28cf54d..84065bf816 100644
--- a/lib/chef/http/authenticator.rb
+++ b/lib/chef/http/authenticator.rb
@@ -47,7 +47,7 @@ class Chef
       end
 
       def handle_request(method, url, headers = {}, data = false)
-        headers.merge!({ "X-Ops-Server-API-Version" => @api_version })
+        headers["X-Ops-Server-API-Version"] = @api_version
         headers.merge!(authentication_headers(method, url, data, headers)) if sign_requests?
         [method, url, headers, data]
       end
diff --git a/lib/chef/http/basic_client.rb b/lib/chef/http/basic_client.rb
index e0a02a05cf..58ae496418 100644
--- a/lib/chef/http/basic_client.rb
+++ b/lib/chef/http/basic_client.rb
@@ -104,7 +104,7 @@ class Chef
         # proxy before parsing. The regex /^.*:\/\// matches, for example, http://. Reusing proxy
         # here since we are really just trying to get the string built correctly.
         if String === proxy && !proxy.strip.empty?
-          if proxy.match(/^.*:\/\//)
+          if proxy =~ /^.*:\/\//
             proxy = URI.parse(proxy.strip)
           else
             proxy = URI.parse("#{url.scheme}://#{proxy.strip}")
diff --git a/lib/chef/http/remote_request_id.rb b/lib/chef/http/remote_request_id.rb
index ef8a18a1e3..a779df805e 100644
--- a/lib/chef/http/remote_request_id.rb
+++ b/lib/chef/http/remote_request_id.rb
@@ -25,7 +25,7 @@ class Chef
       end
 
       def handle_request(method, url, headers = {}, data = false)
-        headers.merge!({ "X-REMOTE-REQUEST-ID" => Chef::RequestID.instance.request_id })
+        headers["X-REMOTE-REQUEST-ID"] = Chef::RequestID.instance.request_id
         [method, url, headers, data]
       end
 
diff --git a/lib/chef/http/socketless_chef_zero_client.rb b/lib/chef/http/socketless_chef_zero_client.rb
index c8590903f6..8c1578b976 100644
--- a/lib/chef/http/socketless_chef_zero_client.rb
+++ b/lib/chef/http/socketless_chef_zero_client.rb
@@ -67,7 +67,7 @@ class Chef
           end
 
           if block_given?
-            block.call(@body)
+            yield(@body)
           else
             super
           end
@@ -148,7 +148,8 @@ class Chef
         @url.port
       end
 
-      def request(method, url, body, headers, &handler_block)
+      # FIXME: yard with @yield
+      def request(method, url, body, headers)
         request = req_to_rack(method, url, body, headers)
         res = ChefZero::SocketlessServerMap.request(port, request)