ruby-changes:63854
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Thu, 3 Dec 2020 14:55:51 +0900 (JST)
Subject: [ruby-changes:63854] 43b95bafd5 (master): delete deprecated IO-like methods
https://git.ruby-lang.org/ruby.git/commit/?id=43b95bafd5 From 43b95bafd57d04c8fb401d3a9b52aca3f5b4b0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= <shyouhei@r...> Date: Mon, 27 Jul 2020 11:15:50 +0900 Subject: 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. diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index a380d2f..bb7c0e6 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -833,18 +833,6 @@ strio_each_byte(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L833 } /* - * 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) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1046 } /* - * 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) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1077 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) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1328 } /* - * 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) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1795 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 bc41b55..c8b206f 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -4004,20 +4004,6 @@ rb_gzreader_each_byte(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L4004 } /* - * 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) https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L4276 } /* - * 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) https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L4735 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); diff --git a/io.c b/io.c index ca59729..0182042 100644 --- a/io.c +++ b/io.c @@ -3959,19 +3959,6 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io) https://github.com/ruby/ruby/blob/trunk/io.c#L3959 } /* - * This is a deprecated alias for #each_line. - */ - -static VALUE -rb_io_lines(int argc, VALUE *argv, VALUE io) -{ - rb_warn_deprecated("IO#lines", "#each_line"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv); - return rb_io_each_line(argc, argv, io); -} - -/* * call-seq: * ios.each_byte {|byte| block } -> ios * ios.each_byte -> an_enumerator @@ -4009,19 +3996,6 @@ rb_io_each_byte(VALUE io) https://github.com/ruby/ruby/blob/trunk/io.c#L3996 return io; } -/* - * This is a deprecated alias for #each_byte. - */ - -static VALUE -rb_io_bytes(VALUE io) -{ - rb_warn_deprecated("IO#bytes", "#each_byte"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0); - return rb_io_each_byte(io); -} - static VALUE io_getc(rb_io_t *fptr, rb_encoding *enc) { @@ -4164,20 +4138,6 @@ rb_io_each_char(VALUE io) https://github.com/ruby/ruby/blob/trunk/io.c#L4138 } /* - * This is a deprecated alias for #each_char. - */ - -static VALUE -rb_io_chars(VALUE io) -{ - rb_warn_deprecated("IO#chars", "#each_char"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0); - return rb_io_each_char(io); -} - - -/* * call-seq: * ios.each_codepoint {|c| block } -> ios * ios.codepoints {|c| block } -> ios @@ -4295,20 +4255,6 @@ rb_io_each_codepoint(VALUE io) https://github.com/ruby/ruby/blob/trunk/io.c#L4255 } /* - * This is a deprecated alias for #each_codepoint. - */ - -static VALUE -rb_io_codepoints(VALUE io) -{ - rb_warn_deprecated("IO#codepoints", "#each_codepoint"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_codepoint")), 0, 0); - return rb_io_each_codepoint(io); -} - - -/* * call-seq: * ios.getc -> string or nil * @@ -12755,23 +12701,7 @@ argf_each_line(int argc, VALUE *argv, VALUE argf) https://github.com/ruby/ruby/blob/trunk/io.c#L12701 } /* - * This is a deprecated alias for #each_line. - */ - -static VALUE -argf_lines(int argc, VALUE *argv, VALUE argf) -{ - rb_warn_deprecated("ARGF#lines", "#each_line"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_line")), argc, argv); - return argf_each_line(argc, argv, argf); -} - -/* * call-seq: - * ARGF.bytes {|byte| block } -> ARGF - * ARGF.bytes -> an_enumerator - * * ARGF.each_byte {|byte| block } -> ARGF * ARGF.each_byte -> an_enumerator * @@ -12802,19 +12732,6 @@ argf_each_byte(VALUE argf) https://github.com/ruby/ruby/blob/trunk/io.c#L12732 } /* - * This is a deprecated alias for #each_byte. - */ - -static VALUE -argf_bytes(VALUE argf) -{ - rb_warn_deprecated("ARGF#bytes", "#each_byte"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_byte")), 0, 0); - return argf_each_byte(argf); -} - -/* * call-seq: * ARGF.each_char {|char| block } -> ARGF * ARGF.each_char -> an_enumerator @@ -12841,19 +12758,6 @@ argf_each_char(VALUE argf) https://github.com/ruby/ruby/blob/trunk/io.c#L12758 } /* - * This is a deprecated alias for #each_char. - */ - -static VALUE -argf_chars(VALUE argf) -{ - rb_warn_deprecated("ARGF#chars", "#each_char"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("eac (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/