Merge branch 'master' of https://github.com/lostisland/faraday into f…

…ix/rubocop-style-s

# Conflicts:
#	.rubocop_todo.yml

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-02 16:35:49 +0000 using RuboCop version 0.65.0.
+# on 2019-03-03 15:58:42 +0900 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
@@ -77,14 +77,6 @@ Style/DoubleNegation:
     - 'lib/faraday/options/env.rb'
     - 'lib/faraday/response.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: compact, expanded
-Style/EmptyMethod:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
 # Offense count: 9
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated

spec/spec_helper.rb

@@ -120,11 +120,9 @@
 
 # Extends RSpec DocumentationFormatter to hide skipped tests.
 module FormatterOverrides
-  def example_pending(_arg)
-  end
+  def example_pending(_arg); end
 
-  def dump_pending(_arg)
-  end
+  def dump_pending(_arg); end
 
   RSpec::Core::Formatters::DocumentationFormatter.prepend self
 end