[前][次][番号順一覧][スレッド一覧]

ruby-changes:70838

From: Nobuyoshi <ko1@a...>
Date: Wed, 12 Jan 2022 23:53:45 +0900 (JST)
Subject: [ruby-changes:70838] e28dbd0f3d (master): [ruby/optparse] Fix for ruby 3.0 or earlier

https://git.ruby-lang.org/ruby.git/commit/?id=e28dbd0f3d

From e28dbd0f3d08536d61e4e2c0ac938161ac16f29f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 12 Jan 2022 20:58:54 +0900
Subject: [ruby/optparse] Fix for ruby 3.0 or earlier

https://github.com/ruby/optparse/commit/9e29d86c12
---
 test/optparse/test_did_you_mean.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index 14f6ebee17e..4c6da4f74ec 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -12,8 +12,10 @@ class TestOptionParser::DidYouMean < TestOptionParser https://github.com/ruby/ruby/blob/trunk/test/optparse/test_did_you_mean.rb#L12
     @opt.def_option("--foo", Integer) { |v| @foo = v }
     @opt.def_option("--bar", Integer) { |v| @bar = v }
     @opt.def_option("--baz", Integer) { |v| @baz = v }
-    unless ::DidYouMean::Formatter.respond_to?(:message_for)
-      @formatter = ::DidYouMean.formatter
+    @formatter = ::DidYouMean.formatter
+    if ::DidYouMean.const_defined?(:Formatter)
+      ::DidYouMean.formatter = ::DidYouMean::Formatter
+    else
       case @formatter
       when ::DidYouMean::PlainFormatter
       else
@@ -23,9 +25,7 @@ class TestOptionParser::DidYouMean < TestOptionParser https://github.com/ruby/ruby/blob/trunk/test/optparse/test_did_you_mean.rb#L25
   end
 
   def teardown
-    unless ::DidYouMean::Formatter.respond_to?(:message_for)
-      ::DidYouMean.formatter = @formatter
-    end
+    ::DidYouMean.formatter = @formatter
   end
 
   def test_no_suggestion
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]