Explicitly require ruby_features where needed

pirj · pirj · commit 2184664e3f3b · 2020-11-13T00:20:04.000+03:00
diff --git a/lib/rspec/support.rb b/lib/rspec/support.rb
@@ -19,7 +19,6 @@ def self.define_optimized_require_for_rspec(lib, &require_relative)
 
     define_optimized_require_for_rspec(:support) { |f| require_relative(f) }
     require_rspec_support "version"
-    require_rspec_support "ruby_features"
 
     # @api private
     KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
diff --git a/lib/rspec/support/caller_filter.rb b/lib/rspec/support/caller_filter.rb
@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_support "ruby_features"
-
 module RSpec
   # Consistent implementation for "cleaning" the caller method to strip out
   # non-rspec lines. This enables errors to be reported at the call site in
diff --git a/lib/rspec/support/directory_maker.rb b/lib/rspec/support/directory_maker.rb
@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_support 'ruby_features'
-
 module RSpec
   module Support
     # @api private
diff --git a/lib/rspec/support/encoded_string.rb b/lib/rspec/support/encoded_string.rb
@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support "ruby_features"
+
 module RSpec
   module Support
     # @private
diff --git a/lib/rspec/support/spec/library_wide_checks.rb b/lib/rspec/support/spec/library_wide_checks.rb
@@ -1,4 +1,5 @@
 require 'rspec/support/spec/shell_out'
+RSpec::Support.require_rspec_support 'ruby_features'
 
 module RSpec
   module Support

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-RSpec::Support.require_rspec_support "ruby_features"`
`2`		`-`
`3`	`1`	`module RSpec`
`4`	`2`	`# Consistent implementation for "cleaning" the caller method to strip out`
`5`	`3`	`# non-rspec lines. This enables errors to be reported at the call site in`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-RSpec::Support.require_rspec_support 'ruby_features'`
`2`		`-`
`3`	`1`	`module RSpec`
`4`	`2`	`module Support`
`5`	`3`	`# @api private`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+RSpec::Support.require_rspec_support "ruby_features"`
	`2`	`+`
`1`	`3`	`module RSpec`
`2`	`4`	`module Support`
`3`	`5`	`# @private`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'rspec/support/spec/shell_out'`
	`2`	`+RSpec::Support.require_rspec_support 'ruby_features'`
`2`	`3`
`3`	`4`	`module RSpec`
`4`	`5`	`module Support`