remove unnecessary object/conversions file

rails · Oct 2, 2012 · ae9b3d7 · ae9b3d7
1 parent 0d41d69
commit ae9b3d7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
@@ -1,14 +1,11 @@
 require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/object/deep_dup'
-require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/object/inclusion'
-
-require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/instance_variables'
-
 require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/with_options'
diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/big_decimal'
-require 'active_support/core_ext/object/conversions'
 
 require 'active_support/core_ext' # FIXME: pulling in all to_xml extensions
 require 'active_support/hash_with_indifferent_access'

diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
@@ -3,7 +3,6 @@
 require 'bigdecimal'
 require 'active_support/core_ext/string/access'
 require 'active_support/ordered_hash'
-require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/deep_dup'
 require 'active_support/inflections'