merge revision(s) f1c78b23313e63eb31a213cc7277b1eb206a581b:

	Suppress warning for shadowing outer local variable

2 files changed, 4 insertions, 4 deletions

diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 4887d944c5..2c8bc7f359 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -741,9 +741,9 @@ eom
       %w[
         CLOCK_THREAD_CPUTIME_ID CLOCK_PROCESS_CPUTIME_ID
         CLOCK_MONOTONIC
-      ].find do |clk|
-        if Process.const_defined?(clk)
-          [clk.to_sym, Process.const_get(clk)].find do |clk|
+      ].find do |c|
+        if Process.const_defined?(c)
+          [c.to_sym, Process.const_get(c)].find do |clk|
             Process.clock_gettime(clk)
           rescue
             # Constants may be defined but not implemented, e.g., mingw.
diff --git a/version.h b/version.h
index 047fc7b129..212e603ecf 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 219
+#define RUBY_PATCHLEVEL 220
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"