aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-25 11:12:27 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-25 11:12:27 -0800
commit763f32ab47b96289a4d7b7107411a83164bf69de (patch)
tree6c21a993853835a30c1df111f75df28f888ea040 /activesupport
parentffc45f3e7128f0ef1efca0f39d4717447c15f5b8 (diff)
downloadrails-763f32ab47b96289a4d7b7107411a83164bf69de.tar.gz
rails-763f32ab47b96289a4d7b7107411a83164bf69de.tar.bz2
rails-763f32ab47b96289a4d7b7107411a83164bf69de.zip
metaclass deprecated in 2.3.6
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/object.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/object/metaclass.rb14
-rw-r--r--activesupport/test/core_ext/object_and_class_ext_test.rb7
3 files changed, 0 insertions, 22 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
index 9dc6ca66a4..4f86d9d605 100644
--- a/activesupport/lib/active_support/core_ext/object.rb
+++ b/activesupport/lib/active_support/core_ext/object.rb
@@ -5,7 +5,6 @@ require 'active_support/core_ext/object/try'
require 'active_support/core_ext/object/conversions'
require 'active_support/core_ext/object/instance_variables'
-require 'active_support/core_ext/object/metaclass'
require 'active_support/core_ext/object/singleton_class'
require 'active_support/core_ext/object/misc'
require 'active_support/core_ext/object/extending'
diff --git a/activesupport/lib/active_support/core_ext/object/metaclass.rb b/activesupport/lib/active_support/core_ext/object/metaclass.rb
deleted file mode 100644
index 4b36a243c9..0000000000
--- a/activesupport/lib/active_support/core_ext/object/metaclass.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'active_support/deprecation'
-
-class Object
- # Get object's meta (ghost, eigenclass, singleton) class.
- #
- # Deprecated in favor of Object#singleton_class.
- def metaclass
- class << self
- self
- end
- end
-
- deprecate :metaclass => :singleton_class
-end
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index 00c59d84b8..437bb78a4e 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -123,13 +123,6 @@ class ObjectTests < ActiveSupport::TestCase
o = Object.new
assert_equal class << o; self end, o.singleton_class
end
-
- def test_metaclass_deprecated
- o = Object.new
- assert_deprecated /use singleton_class instead/ do
- assert_equal o.singleton_class, o.metaclass
- end
- end
end
class ObjectInstanceVariableTest < Test::Unit::TestCase