From 68d028578a5975fe6c44d29c502615ff9af72927 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 5 Mar 2021 12:47:00 -0800 Subject: [PATCH] Undef Enumerator::Chain#{feed,next,next_values,peek,peek_values} Previously these methods were defined but raised TypeError, which seems worse. --- enumerator.c | 5 +++++ test/ruby/test_enumerator.rb | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/enumerator.c b/enumerator.c index 45620f352a..a43434dd94 100644 --- a/enumerator.c +++ b/enumerator.c @@ -4200,6 +4200,11 @@ InitVM_Enumerator(void) rb_define_method(rb_cEnumChain, "size", enum_chain_size, 0); rb_define_method(rb_cEnumChain, "rewind", enum_chain_rewind, 0); rb_define_method(rb_cEnumChain, "inspect", enum_chain_inspect, 0); + rb_undef_method(rb_cEnumChain, "feed"); + rb_undef_method(rb_cEnumChain, "next"); + rb_undef_method(rb_cEnumChain, "next_values"); + rb_undef_method(rb_cEnumChain, "peek"); + rb_undef_method(rb_cEnumChain, "peek_values"); /* ArithmeticSequence */ rb_cArithSeq = rb_define_class_under(rb_cEnumerator, "ArithmeticSequence", rb_cEnumerator); diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 4e698fc478..4342c10d02 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -832,6 +832,12 @@ class TestEnumerator < Test::Unit::TestCase assert_equal(33, chain.next) end + def test_chain_undef_methods + chain = [1].to_enum + [2].to_enum + meths = (chain.methods & [:feed, :next, :next_values, :peek, :peek_values]) + assert_equal(0, meths.size) + end + def test_produce assert_raise(ArgumentError) { Enumerator.produce }