Use optimized require

Changelog.md

@@ -1,12 +1,14 @@
 ### 3.0.0.rc1 Development
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.0.beta2...master)
 
-Breaking Changes:
+Breaking Changes for 3.0.0:
 
 * Remove `matcher_execution_context` attribute from DSL-defined
   custom matchers. (Myron Marston)
 * Remove `RSpec::Matchers::Pretty#_pretty_print`. (Myron Marston)
 * Remove `RSpec::Matchers::Pretty#expected_to_sentence`. (Myron Marston)
+* Rename `RSpec::Matchers::Configuration` constant to
+  `RSpec::Expectations::Configuration`. (Myron Marston)
 
 Bug Fixes:
 

lib/rspec/expectations.rb

@@ -1,13 +1,19 @@
-require 'rspec/support/caller_filter'
-require 'rspec/support/warnings'
+require 'rspec/support'
+RSpec::Support.require_rspec_support "caller_filter"
+RSpec::Support.require_rspec_support "warnings"
 
 require 'rspec/matchers'
-require 'rspec/expectations/expectation_target'
-require 'rspec/matchers/configuration'
-require 'rspec/expectations/fail_with'
-require 'rspec/expectations/handler'
-require 'rspec/expectations/version'
-require 'rspec/expectations/diff_presenter'
+
+RSpec::Support.define_optimized_require_for_rspec(:expectations) { |f| require_relative(f) }
+
+%w[
+  expectation_target
+  configuration
+  fail_with
+  handler
+  version
+  diff_presenter
+].each { |file| RSpec::Support.require_rspec_expectations(file) }
 
 module RSpec
   # RSpec::Expectations provides a simple, readable API to express

lib/rspec/matchers/configuration.rb → lib/rspec/expectations/configuration.rb

@@ -1,7 +1,7 @@
-require 'rspec/expectations/syntax'
+RSpec::Support.require_rspec_expectations "syntax"
 
 module RSpec
-  module Matchers
+  module Expectations
     # Provides configuration options for rspec-expectations.
     # If you are using rspec-core, you can access this via a
     # block passed to `RSpec::Core::Configuration#expect_with`.
@@ -125,8 +125,8 @@ def self.format_backtrace(backtrace)
       end
     end
 
-    # The configuration object
-    # @return [RSpec::Matchers::Configuration] the configuration object
+    # The configuration object.
+    # @return [RSpec::Expectations::Configuration] the configuration object
     def self.configuration
       @configuration ||= Configuration.new
     end

lib/rspec/expectations/diff_presenter.rb

@@ -1,8 +1,8 @@
 require 'diff/lcs'
-require "rspec/expectations/encoded_string"
-require "rspec/expectations/differ"
 require 'diff/lcs/hunk'
 require 'pp'
+RSpec::Support.require_rspec_expectations "encoded_string"
+RSpec::Support.require_rspec_expectations "differ"
 
 module RSpec
   module Expectations

lib/rspec/matchers.rb

@@ -1,10 +1,15 @@
-require 'rspec/matchers/pretty'
-require 'rspec/matchers/composable'
-require 'rspec/matchers/built_in'
-require 'rspec/matchers/generated_descriptions'
-require 'rspec/matchers/dsl'
-require 'rspec/matchers/matcher_delegator'
-require 'rspec/matchers/aliased_matcher'
+require 'rspec/support'
+RSpec::Support.define_optimized_require_for_rspec(:matchers) { |f| require_relative(f) }
+
+%w[
+  pretty
+  composable
+  built_in
+  generated_descriptions
+  dsl
+  matcher_delegator
+  aliased_matcher
+].each { |file| RSpec::Support.require_rspec_matchers(file) }
 
 # RSpec's top level namespace. All of rspec-expectations is contained
 # in the `RSpec::Expectations` and `RSpec::Matchers` namespaces.
@@ -843,6 +848,15 @@ def yield_successive_args(*args)
     alias_matcher :a_block_yielding_successive_args,  :yield_successive_args
     alias_matcher :yielding_successive_args,          :yield_successive_args
 
+    # Delegates to {RSpec::Expectations.configuration}.
+    # This is here because rspec-core's `expect_with` option
+    # looks for a `configuration` method on the mixin
+    # (`RSpec::Matchers`) to yield to a block.
+    # @return [RSpec::Expectations::Configuration] the configuration object
+    def self.configuration
+      Expectations.configuration
+    end
+
   private
 
     BE_PREDICATE_REGEX = /^(be_(?:an?_)?)(.*)/

lib/rspec/matchers/built_in.rb

@@ -1,4 +1,4 @@
-require 'rspec/matchers/built_in/base_matcher'
+RSpec::Support.require_rspec_matchers "built_in/base_matcher"
 
 module RSpec
   module Matchers

lib/rspec/matchers/built_in/be.rb

@@ -1,5 +1,3 @@
-require 'rspec/matchers/dsl'
-
 module RSpec
   module Matchers
     module BuiltIn

lib/rspec/matchers/composable.rb

@@ -1,4 +1,4 @@
-require 'rspec/support/fuzzy_matcher'
+RSpec::Support.require_rspec_support "fuzzy_matcher"
 
 module RSpec
   module Matchers

spec/rspec/matchers/configuration_spec.rb → spec/rspec/expectations/configuration_spec.rb

@@ -1,14 +1,7 @@
 require 'delegate'
 
 module RSpec
-  module Matchers
-    describe "RSpec::Matchers.configuration" do
-      it 'returns a memoized configuration instance' do
-        expect(RSpec::Matchers.configuration).to be_a(RSpec::Matchers::Configuration)
-        expect(RSpec::Matchers.configuration).to be(RSpec::Matchers.configuration)
-      end
-    end
-
+  module Expectations
     describe Configuration do
       let(:config) { Configuration.new }
 

spec/rspec/matchers_spec.rb

@@ -2,6 +2,13 @@
 describe RSpec::Matchers do
   include ::RSpec::Support::InSubProcess
 
+  describe ".configuration" do
+    it 'returns a memoized configuration instance' do
+      expect(RSpec::Matchers.configuration).to be_a(RSpec::Expectations::Configuration)
+      expect(RSpec::Matchers.configuration).to be(RSpec::Matchers.configuration)
+    end
+  end
+
   it 'can be mixed into `main`' do
     in_sub_process do
       main.instance_eval do