Removed AS core_ext/kernel/requires as it's not used and is bad pract…

…ice.
rails · May 23, 2011 · eff5d9a · eff5d9a · fxn · May 23, 2011
1 parent a8b2a89
commit eff5d9a
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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 @@ def initialize(app)
 
         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
@@ -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'