diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-26 08:52:19 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-26 08:52:19 +0000 |
commit | 2b21744efa34a685d0b3d3b333622989a7615cda (patch) | |
tree | cb6fcf2d0dd7eeaa3fd0578e4d58571b98c19e1d /string.c | |
parent | 35b7af7503d380f220b5730d47b542ba295be37b (diff) |
string.c: remove the deprecation warnings of `String#bytes` with block
And its friends: lines, chars, grapheme_clusters, and codepoints.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 19 |
1 files changed, 1 insertions, 18 deletions
@@ -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) |