Merge pull request #403 from rspec/use-method-handle-for-from-support

Use `method_handle_for` from rspec-support.

lib/rspec/expectations.rb

@@ -57,31 +57,5 @@ module Expectations
     else
       Class.new(::StandardError)
     end
-
-    # @api private
-    KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
-
-    # @api private
-    #
-    # Used internally to get a method handle for a particular object
-    # and method name.
-    #
-    # Includes handling for a few special cases:
-    #
-    #   - Objects that redefine #method (e.g. an HTTPRequest struct)
-    #   - BasicObject subclasses that mixin a Kernel dup (e.g. SimpleDelegator)
-    if RUBY_VERSION.to_i >= 2
-      def self.method_handle_for(object, method_name)
-        KERNEL_METHOD_METHOD.bind(object).call(method_name)
-      end
-    else
-      def self.method_handle_for(object, method_name)
-        if ::Kernel === object
-          KERNEL_METHOD_METHOD.bind(object).call(method_name)
-        else
-          object.method(method_name)
-        end
-      end
-    end
   end
 end

lib/rspec/matchers/built_in/operators.rb

@@ -1,3 +1,5 @@
+require 'rspec/support'
+
 module RSpec
   module Matchers
     module BuiltIn
@@ -66,7 +68,7 @@ def description
       private
 
         def uses_generic_implementation_of?(op)
-          Expectations.method_handle_for(@actual, op).owner == ::Kernel
+          Support.method_handle_for(@actual, op).owner == ::Kernel
         rescue NameError
           false
         end