diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2726d363b..ade0634b0 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-02-20 22:05:38 +0100 using RuboCop version 0.65.0. +# on 2019-02-20 22:19:54 +0100 using RuboCop version 0.65.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -1120,22 +1120,6 @@ Style/TernaryParentheses: - 'lib/faraday/options.rb' - 'lib/faraday/upload_io.rb' -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleForMultiline. -# SupportedStylesForMultiline: comma, consistent_comma, no_comma -Style/TrailingCommaInArrayLiteral: - Exclude: - - 'lib/faraday/adapter/net_http.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleForMultiline. -# SupportedStylesForMultiline: comma, consistent_comma, no_comma -Style/TrailingCommaInHashLiteral: - Exclude: - - 'lib/faraday/adapter/em_http.rb' - # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist. diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb index a569f6778..b2b5ca2f1 100644 --- a/lib/faraday/adapter/em_http.rb +++ b/lib/faraday/adapter/em_http.rb @@ -18,7 +18,7 @@ def connection_config(env) def request_config(env) options = { :body => read_body(env), - :head => env[:request_headers], + :head => env[:request_headers] # :keepalive => true, # :file => 'path/to/file', # stream data off disk } diff --git a/lib/faraday/adapter/net_http.rb b/lib/faraday/adapter/net_http.rb index 8f47a2a28..2cd941bb3 100644 --- a/lib/faraday/adapter/net_http.rb +++ b/lib/faraday/adapter/net_http.rb @@ -23,7 +23,7 @@ class NetHttp < Faraday::Adapter Net::HTTPHeaderSyntaxError, Net::ProtocolError, SocketError, - Zlib::GzipFile::Error, + Zlib::GzipFile::Error ] NET_HTTP_EXCEPTIONS << OpenSSL::SSL::SSLError if defined?(OpenSSL)