merge revision(s) 42379: [Backport #8904]

* enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle
	  Patch by @kachick [Fixes GH-372]
	  https://github.com/ruby/ruby/pull/372


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-09-13 14:18:33 +00:00
parent 4c2f2ffc02
commit 4dbca94e9e
3 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,9 @@
Fri Sep 13 23:16:12 2013 Zachary Scott <e@zzak.io>
* enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle
Patch by @kachick [Fixes GH-372]
https://github.com/ruby/ruby/pull/372
Fri Sep 13 22:40:28 2013 Koichi Sasada <ko1@atdot.net> Fri Sep 13 22:40:28 2013 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of * vm_insnhelper.c (vm_search_super_method): use ci->argc instead of

View file

@ -1347,8 +1347,8 @@ lazy_set_method(VALUE lazy, VALUE args, VALUE (*size_fn)(ANYARGS))
* *
* Returns a lazy enumerator, whose methods map/collect, * Returns a lazy enumerator, whose methods map/collect,
* flat_map/collect_concat, select/find_all, reject, grep, zip, take, * flat_map/collect_concat, select/find_all, reject, grep, zip, take,
* take_while, drop, drop_while, and cycle enumerate values only on an * take_while, drop, and drop_while enumerate values only on an
* as-needed basis. However, if a block is given to zip or cycle, values * as-needed basis. However, if a block is given to zip, values
* are enumerated immediately. * are enumerated immediately.
* *
* === Example * === Example

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-09-13" #define RUBY_RELEASE_DATE "2013-09-13"
#define RUBY_PATCHLEVEL 310 #define RUBY_PATCHLEVEL 311
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9