merges r20125 from trunk into ruby_1_9_1.

* string.c (Init_String): remove Symbol#===.  [ruby-dev:37026]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cb101bf2b..dbe52979cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov  7 06:58:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): remove Symbol#===.  [ruby-dev:37026]
+
 Fri Nov  7 02:00:12 2008  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/rexml/entity.rb (unnormalized): do not call
diff --git a/string.c b/string.c
index eb4625f495..08f3cdbf5c 100644
--- a/string.c
+++ b/string.c
@@ -6942,13 +6942,6 @@ sym_match(VALUE sym, VALUE other)
 }
 
 static VALUE
-sym_eqq(VALUE sym, VALUE other)
-{
-    if (sym == other) return Qtrue;
-    return rb_str_equal(rb_sym_to_s(sym), other);
-}
-
-static VALUE
 sym_aref(int argc, VALUE *argv, VALUE sym)
 {
     return rb_str_aref_m(argc, argv, rb_sym_to_s(sym));
@@ -7188,7 +7181,6 @@ Init_String(void)
     rb_define_method(rb_cSymbol, "<=>", sym_cmp, 1);
     rb_define_method(rb_cSymbol, "casecmp", sym_casecmp, 1);
     rb_define_method(rb_cSymbol, "=~", sym_match, 1);
-    rb_define_method(rb_cSymbol, "===", sym_eqq, 1);
 
     rb_define_method(rb_cSymbol, "[]", sym_aref, -1);
     rb_define_method(rb_cSymbol, "slice", sym_aref, -1);