From 38f9c832e812f96fd06ca73688ff2baa528c119c Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 16 Feb 2021 13:13:27 +0900 Subject: [PATCH] merge revision(s) 49d3830f44031174ad450a0ea1cdcdf0eabf9d0e: [Backport #17560] Fix documentation for Module#ruby2_keywords It returns nil, not self. Fixes [Bug #17560] --- vm_method.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- version.h | 4 ++-- vm_method.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/version.h b/version.h index 4c08ff5581..233bfafb70 100644 --- a/version.h +++ b/version.h @@ -12,11 +12,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 40 +#define RUBY_PATCHLEVEL 41 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" diff --git a/vm_method.c b/vm_method.c index 928b509651..51b8b6b07b 100644 --- a/vm_method.c +++ b/vm_method.c @@ -2107,7 +2107,7 @@ rb_mod_private(int argc, VALUE *argv, VALUE module) /* * call-seq: - * ruby2_keywords(method_name, ...) -> self + * ruby2_keywords(method_name, ...) -> nil * * For the given method names, marks the method as passing keywords through * a normal argument splat. This should only be called on methods that