From 49995e8ed107b14eaac382f45347db2f1fff2a9e Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 22 Jul 2011 12:49:55 +0000 Subject: merge revision(s) 32595: * enum.c (enum_inject): remove empty line to notify rdoc Enumerable#reduce is alias. patched by milki@github. https://github.com/ruby/ruby/pull/26 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enum.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f6f5cc9b81..b29accd024 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 22 21:49:48 2011 NARUSE, Yui + + * enum.c (enum_inject): remove empty line to notify rdoc + Enumerable#reduce is alias. patched by milki@github. + https://github.com/ruby/ruby/pull/26 + Fri Jul 22 21:49:28 2011 NARUSE, Yui * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each): diff --git a/enum.c b/enum.c index 9ced77714a..de954c938f 100644 --- a/enum.c +++ b/enum.c @@ -521,7 +521,6 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv) * enum.inject(sym) -> obj * enum.inject(initial) {| memo, obj | block } -> obj * enum.inject {| memo, obj | block } -> obj - * * enum.reduce(initial, sym) -> obj * enum.reduce(sym) -> obj * enum.reduce(initial) {| memo, obj | block } -> obj -- cgit v1.2.3