Merge branch 'master' into grosser/args

grosser · Dec 7, 2020 · 2445a3a · 2445a3a
2 parents 2143bb2 + e111db3
commit 2445a3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb
@@ -93,17 +93,15 @@ def request_options(env)
       dependency do
         require 'em-http'
 
-        if Faraday::Adapter::EMHttp.loaded?
-          begin
-            require 'openssl'
-          rescue LoadError
-            warn 'Warning: no such file to load -- openssl. ' \
-              'Make sure it is installed if you want HTTPS support'
-          else
-            require 'em-http/version'
-            if EventMachine::HttpRequest::VERSION < '1.1.6'
-              require 'faraday/adapter/em_http_ssl_patch'
-            end
+        begin
+          require 'openssl'
+        rescue LoadError
+          warn 'Warning: no such file to load -- openssl. ' \
+            'Make sure it is installed if you want HTTPS support'
+        else
+          require 'em-http/version'
+          if EventMachine::HttpRequest::VERSION < '1.1.6'
+            require 'faraday/adapter/em_http_ssl_patch'
           end
         end
       end

diff --git a/lib/faraday/dependency_loader.rb b/lib/faraday/dependency_loader.rb
@@ -13,7 +13,7 @@ def dependency(lib = nil)
       self.load_error = e
     end
 
-    def new(*args, **kwargs)
+    def new(*)
       unless loaded?
         raise "missing dependency for #{self}: #{load_error.message}"
       end