Removed AS core_ext/kernel/requires as it's not used and is bad practice.

7 files changed, 3 insertions, 35 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index a9f4c08348..187b0b2dd8 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -1,5 +1,4 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/object/blank'
 require 'set'
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 0a460bc086..f94d52e20e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -1,5 +1,4 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/object/blank'
 
 # Make sure we're using pg high enough for PGResult#values
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index d2785b234a..39c9b6fa1d 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -1,5 +1,4 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_support/core_ext/kernel/requires'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
diff --git a/activesupport/lib/active_support/core_ext/kernel.rb b/activesupport/lib/active_support/core_ext/kernel.rb
index 01cfe7fc10..0275f4c037 100644
--- a/activesupport/lib/active_support/core_ext/kernel.rb
+++ b/activesupport/lib/active_support/core_ext/kernel.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/agnostics'
-require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/kernel/debugger'
 require 'active_support/core_ext/kernel/singleton_class'
diff --git a/activesupport/lib/active_support/core_ext/kernel/requires.rb b/activesupport/lib/active_support/core_ext/kernel/requires.rb
deleted file mode 100644
index 3bf46271d7..0000000000
--- a/activesupport/lib/active_support/core_ext/kernel/requires.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'active_support/core_ext/kernel/reporting'
-
-module Kernel
-  # Require a library with fallback to RubyGems.  Warnings during library
-  # loading are silenced to increase signal/noise for application warnings.
-  def require_library_or_gem(library_name)
-    silence_warnings do
-      begin
-        require library_name
-      rescue LoadError => cannot_require
-        # 1. Requiring the module is unsuccessful, maybe it's a gem and nobody required rubygems yet. Try.
-        begin
-          require 'rubygems'
-        rescue LoadError # => rubygems_not_installed
-          raise cannot_require
-        end
-        # 2. Rubygems is installed and loaded. Try to load the library again
-        begin
-          require library_name
-        rescue LoadError # => gem_not_installed
-          raise cannot_require
-        end
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 06e23db5f1..831188eeee 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/kernel/requires'
-
 module Rails
   module Rack
     class Debugger
@@ -8,11 +6,12 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem 'ruby-debug'
+        require 'ruby-debug'
+
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-      rescue Exception
+      rescue LoadError
         puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
         exit
       end
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 41485c8bac..68f566274d 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -3,7 +3,6 @@
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
 require 'test/unit'
-require 'active_support/core_ext/kernel/requires'
 require 'active_support/test_case'
 require 'action_controller/test_case'
 require 'action_dispatch/testing/integration'