From a6381042fa9899544c365dfa369ab15c79f7f158 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 10 May 2012 19:28:02 -0300
Subject: [PATCH] Remove ruby/shim

require 'action_view' is now much faster
---
 actionpack/lib/abstract_controller.rb         |  1 -
 actionpack/lib/action_view.rb                 |  2 +-
 activesupport/lib/active_support/ruby/shim.rb | 15 ---------------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 activesupport/lib/active_support/ruby/shim.rb

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index cc5878c88e..f970007621 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -3,7 +3,6 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.inc
 
 require 'action_pack'
 require 'active_support/concern'
-require 'active_support/ruby/shim'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/attr_internal'
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 349a3fcc6e..4aa3c12d52 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,9 +21,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support/ruby/shim'
 require 'active_support/core_ext/class/attribute_accessors'
 
+require 'active_support'
 require 'action_pack'
 
 module ActionView
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
deleted file mode 100644
index 13e96b3596..0000000000
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Backported Ruby builtins so you can code with the latest & greatest
-# but still run on any Ruby 1.8.x.
-#
-# Date        next_year, next_month
-# DateTime    to_date, to_datetime, xmlschema
-# Enumerable  group_by, none?
-# String      ord
-# Time        to_date, to_time, to_datetime
-require 'active_support'
-require 'active_support/core_ext/date/calculations'
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/string/interpolation'
-require 'active_support/core_ext/time/conversions'