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

From 1aaeff8e36777e4ea0ac0917e3ddc7da573c1c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 15 Jun 2022 10:14:23 +0200
Subject: [rubygems/rubygems] Remove unnecessary condition

This variable can't be falsy.

https://github.com/rubygems/rubygems/commit/b838f9a6f0
---
 lib/rubygems/ext/cargo_builder.rb    | 24 +++++++++++-------------
 lib/rubygems/ext/ext_conf_builder.rb | 26 ++++++++++++--------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb
index 4c16063224..a08830319d 100644
--- a/lib/rubygems/ext/cargo_builder.rb
+++ b/lib/rubygems/ext/cargo_builder.rb
@@ -263,19 +263,17 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/cargo_builder.rb#L263
       # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
       tmp_dest_relative = get_relative_path(tmp_dest.clone, extension_dir)
 
-      if tmp_dest_relative
-        full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
-
-        # TODO: remove in RubyGems 3
-        if Gem.install_extension_in_lib && lib_dir
-          FileUtils.mkdir_p lib_dir
-          FileUtils.cp_r ext_path, lib_dir, remove_destination: true
-        end
-
-        FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
-          destent = ent.class.new(dest_path, ent.rel)
-          destent.exist? || FileUtils.mv(ent.path, destent.path)
-        end
+      full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
+
+      # TODO: remove in RubyGems 3
+      if Gem.install_extension_in_lib && lib_dir
+        FileUtils.mkdir_p lib_dir
+        FileUtils.cp_r ext_path, lib_dir, remove_destination: true
+      end
+
+      FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
+        destent = ent.class.new(dest_path, ent.rel)
+        destent.exist? || FileUtils.mv(ent.path, destent.path)
       end
     ensure
       FileUtils.rm_rf tmp_dest if tmp_dest
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index ee70706dd4..3fd7559234 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -61,21 +61,19 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/ext_conf_builder.rb#L61
 
         make dest_path, results, extension_dir
 
-        if tmp_dest_relative
-          full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
-
-          # TODO remove in RubyGems 3
-          if Gem.install_extension_in_lib and lib_dir
-            FileUtils.mkdir_p lib_dir
-            entries = Dir.entries(full_tmp_dest) - %w[. ..]
-            entries = entries.map {|entry| File.join full_tmp_dest, entry }
-            FileUtils.cp_r entries, lib_dir, :remove_destination => true
-          end
+        full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
+
+        # TODO remove in RubyGems 3
+        if Gem.install_extension_in_lib and lib_dir
+          FileUtils.mkdir_p lib_dir
+          entries = Dir.entries(full_tmp_dest) - %w[. ..]
+          entries = entries.map {|entry| File.join full_tmp_dest, entry }
+          FileUtils.cp_r entries, lib_dir, :remove_destination => true
+        end
 
-          FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
-            destent = ent.class.new(dest_path, ent.rel)
-            destent.exist? or FileUtils.mv(ent.path, destent.path)
-          end
+        FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
+          destent = ent.class.new(dest_path, ent.rel)
+          destent.exist? or FileUtils.mv(ent.path, destent.path)
         end
       ensure
         ENV["DESTDIR"] = destdir
-- 
cgit v1.2.1


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