Merge pull request #2048 from ruby/fix-GH-3705

Pathname#mkpath and Pathname#rmtree returns self from Ruby 3.4
ruby · Dec 18, 2024 · cdce00a · cdce00a
2 parents 4409572 + ca0f2a0
commit cdce00a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/stdlib/pathname/0/pathname.rbs b/stdlib/pathname/0/pathname.rbs
@@ -895,7 +895,7 @@ class Pathname
   #
   # See FileUtils.mkpath and FileUtils.mkdir_p
   #
-  def mkpath: () -> nil
+  def mkpath: () -> self
 
   # <!--
   #   rdoc-file=ext/pathname/lib/pathname.rb
@@ -1106,7 +1106,7 @@ class Pathname
   #
   # See FileUtils.rm_rf
   #
-  def rmtree: () -> void
+  def rmtree: () -> self
 
   # <!--
   #   rdoc-file=ext/pathname/lib/pathname.rb

diff --git a/test/stdlib/Pathname_test.rb b/test/stdlib/Pathname_test.rb
@@ -458,13 +458,11 @@ def test_mkdir
   end
 
   def test_mkpath
-    if_ruby(... 3.4) do
-      Dir.mktmpdir do |dir|
-        dir = Pathname(dir)
+    Dir.mktmpdir do |dir|
+      dir = Pathname(dir)
 
-        assert_send_type '() -> nil',
+      assert_send_type '() -> Pathname',
                         dir + 'a/b/c', :mkpath
-      end
     end
   end
 
@@ -644,7 +642,7 @@ def test_rmtree
     Dir.mktmpdir do |dir|
       target = Pathname(dir).join('target')
       target.mkdir
-      assert_send_type '() -> void',
+      assert_send_type '() -> Pathname',
                        target, :rmtree
     end
   end