string.c: remove the deprecation warnings of `String#bytes` with block

And its friends: lines, chars, grapheme_clusters, and codepoints.
[Feature #6670] [ruby-core:90728]

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

1 files changed, 1 insertions, 18 deletions

diff --git a/string.c b/string.c
index 71afc98ba5..118403b934 100644
--- a/string.c
+++ b/string.c
@@ -42,8 +42,6 @@
 # define HAVE_CRYPT_R 1
 #endif
 
-#define STRING_ENUMERATORS_WANTARRAY 0 /* next major */
-
 #undef rb_str_new
 #undef rb_usascii_str_new
 #undef rb_utf8_str_new
@@ -7956,22 +7954,7 @@ rb_str_split(VALUE str, const char *sep0)
     return rb_str_split_m(1, &sep, str);
 }
 
-static int
-enumerator_wantarray(const char *method)
-{
-    if (rb_block_given_p()) {
-#if STRING_ENUMERATORS_WANTARRAY
-	rb_warn("given block not used");
-#else
-	rb_warning("passing a block to String#%s is deprecated", method);
-	return 0;
-#endif
-    }
-    return 1;
-}
-
-#define WANTARRAY(m, size) \
-    (enumerator_wantarray(m) ? rb_ary_new_capa(size) : 0)
+#define WANTARRAY(m, size) (!rb_block_given_p() ? rb_ary_new_capa(size) : 0)
 
 static inline int
 enumerator_element(VALUE ary, VALUE e)