From ea222b05571741f36b59f615c2e83b3adafbd398 Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 11 Feb 2021 14:13:56 +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 | 2 +- vm_method.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.h b/version.h index 84a5b160e9..e48d1708a0 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 154 +#define RUBY_PATCHLEVEL 155 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 diff --git a/vm_method.c b/vm_method.c index 4504468789..779ef460a4 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1774,7 +1774,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