diff options
author | 卜部昌平 <[email protected]> | 2020-07-27 11:15:50 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <[email protected]> | 2020-12-03 12:47:51 +0900 |
commit | 43b95bafd57d04c8fb401d3a9b52aca3f5b4b0be (patch) | |
tree | 642b463fce3ff7c5d683eb6e8068cf2dfa2c14df /ext | |
parent | 84eb2bfab940fc9c6962c10ede7f72cee3fb9899 (diff) |
delete deprecated IO-like methods
This commit deletes
{IO,ARGF,StringIO,Zib::GZipReader}#{bytes,chars,lines,codepoints}, which
have been deprecated since c47c095b9740e7c19d6fdca29ab661c1089221d4.
Note that String also has those methods. They are neither depreacted
nor deleted because they are not aliases of counterpart each_something.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/stringio/stringio.c | 52 | ||||
-rw-r--r-- | ext/zlib/zlib.c | 30 |
2 files changed, 0 insertions, 82 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index a380d2fffc..bb7c0e6e4e 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -833,18 +833,6 @@ strio_each_byte(VALUE self) } /* - * This is a deprecated alias for #each_byte. - */ -static VALUE -strio_bytes(VALUE self) -{ - rb_warn("StringIO#bytes is deprecated; use #each_byte instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(self, ID2SYM(rb_intern("each_byte")), 0, 0); - return strio_each_byte(self); -} - -/* * call-seq: * strio.getc -> string or nil * @@ -1058,18 +1046,6 @@ strio_each_char(VALUE self) } /* - * This is a deprecated alias for #each_char. - */ -static VALUE -strio_chars(VALUE self) -{ - rb_warn("StringIO#chars is deprecated; use #each_char instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(self, ID2SYM(rb_intern("each_char")), 0, 0); - return strio_each_char(self); -} - -/* * call-seq: * strio.each_codepoint {|c| block } -> strio * strio.each_codepoint -> anEnumerator @@ -1101,18 +1077,6 @@ strio_each_codepoint(VALUE self) return self; } -/* - * This is a deprecated alias for #each_codepoint. - */ -static VALUE -strio_codepoints(VALUE self) -{ - rb_warn("StringIO#codepoints is deprecated; use #each_codepoint instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(self, ID2SYM(rb_intern("each_codepoint")), 0, 0); - return strio_each_codepoint(self); -} - /* Boyer-Moore search: copied from regex.c */ static void bm_init_skip(long *skip, const char *pat, long m) @@ -1364,18 +1328,6 @@ strio_each(int argc, VALUE *argv, VALUE self) } /* - * This is a deprecated alias for #each_line. - */ -static VALUE -strio_lines(int argc, VALUE *argv, VALUE self) -{ - rb_warn("StringIO#lines is deprecated; use #each_line instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(self, ID2SYM(rb_intern("each_line")), argc, argv); - return strio_each(argc, argv, self); -} - -/* * call-seq: * strio.readlines(sep=$/, chomp: false) -> array * strio.readlines(limit, chomp: false) -> array @@ -1843,13 +1795,9 @@ Init_stringio(void) rb_define_method(StringIO, "each", strio_each, -1); rb_define_method(StringIO, "each_line", strio_each, -1); - rb_define_method(StringIO, "lines", strio_lines, -1); rb_define_method(StringIO, "each_byte", strio_each_byte, 0); - rb_define_method(StringIO, "bytes", strio_bytes, 0); rb_define_method(StringIO, "each_char", strio_each_char, 0); - rb_define_method(StringIO, "chars", strio_chars, 0); rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0); - rb_define_method(StringIO, "codepoints", strio_codepoints, 0); rb_define_method(StringIO, "getc", strio_getc, 0); rb_define_method(StringIO, "ungetc", strio_ungetc, 1); rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index bc41b55491..c8b206f95e 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -4004,20 +4004,6 @@ rb_gzreader_each_byte(VALUE obj) } /* - * Document-method: Zlib::GzipReader#bytes - * - * This is a deprecated alias for <code>each_byte</code>. - */ -static VALUE -rb_gzreader_bytes(VALUE obj) -{ - rb_warn("Zlib::GzipReader#bytes is deprecated; use #each_byte instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(obj, ID2SYM(rb_intern("each_byte")), 0, 0); - return rb_gzreader_each_byte(obj); -} - -/* * Document-method: Zlib::GzipReader#ungetc * * See Zlib::GzipReader documentation for a description. @@ -4290,20 +4276,6 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj) } /* - * Document-method: Zlib::GzipReader#lines - * - * This is a deprecated alias for <code>each_line</code>. - */ -static VALUE -rb_gzreader_lines(int argc, VALUE *argv, VALUE obj) -{ - rb_warn("Zlib::GzipReader#lines is deprecated; use #each_line instead"); - if (!rb_block_given_p()) - return rb_enumeratorize(obj, ID2SYM(rb_intern("each_line")), argc, argv); - return rb_gzreader_each(argc, argv, obj); -} - -/* * Document-method: Zlib::GzipReader#readlines * * See Zlib::GzipReader documentation for a description. @@ -4763,14 +4735,12 @@ Init_zlib(void) rb_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0); rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0); rb_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0); - rb_define_method(cGzipReader, "bytes", rb_gzreader_bytes, 0); rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1); rb_define_method(cGzipReader, "ungetbyte", rb_gzreader_ungetbyte, 1); rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1); rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1); rb_define_method(cGzipReader, "each", rb_gzreader_each, -1); rb_define_method(cGzipReader, "each_line", rb_gzreader_each, -1); - rb_define_method(cGzipReader, "lines", rb_gzreader_lines, -1); rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1); rb_define_method(cGzipReader, "external_encoding", rb_gzreader_external_encoding, 0); |