Merge pull request #2785 from ruby/backports

Ruby 4.0.0 backports

Author: soutaro

lib/rbs/collection/config/lockfile_generator.rb

@@ -184,6 +184,13 @@ def generate
               lockfile.gems[name] = { name: name, version: "0", source: source }
             end
             return
+          when 'set', 'pathname'
+            # set and pathname is migrated to core from stdlib.
+            RBS.logger.info {
+              from = from_gem || "rbs_collection.yaml"
+              "`#{name}` is a part of the Ruby core library. The dependency to the library can be safely deleted from #{from}."
+            }
+            return
           when *ALUMNI_STDLIBS.keys
             version = ALUMNI_STDLIBS.fetch(name)
             if from_gem

test/rbs/cli_test.rb

@@ -1546,6 +1546,86 @@ def test_collection_install__mutex_m__rbs_dependency_and__gem_dependency
     end
   end
 
+  def test_collection_install__pathname_set
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        dir = Pathname(dir)
+        dir.join(RBS::Collection::Config::PATH).write(<<~YAML)
+          sources:
+            - name: ruby/gem_rbs_collection
+              remote: https://github.com/ruby/gem_rbs_collection.git
+              revision: b4d3b346d9657543099a35a1fd20347e75b8c523
+              repo_dir: gems
+
+          path: #{dir.join('gem_rbs_collection')}
+
+          gems:
+          - name: pathname
+          - name: set
+          - name: ast
+          - name: cgi-escape
+        YAML
+
+        bundle_install('ast', 'logger')
+        _stdout, stderr = run_rbs_collection("install", bundler: true)
+
+        assert_include stderr, 'Cannot find `pathname` gem.'
+        assert_include stderr, 'Cannot find `set` gem.'
+
+        lockfile = RBS::Collection::Config::Lockfile.from_lockfile(
+          lockfile_path: dir + "rbs_collection.lock.yaml",
+          data: YAML.safe_load((dir + "rbs_collection.lock.yaml").read)
+        )
+
+        assert_nil lockfile.gems["set"]
+        assert_nil lockfile.gems["pathname"]
+        assert_instance_of RBS::Collection::Sources::Stdlib, lockfile.gems["cgi-escape"][:source]
+        assert_instance_of RBS::Collection::Sources::Git, lockfile.gems["ast"][:source]
+      end
+    end
+  end
+
+  def test_collection_install__set_pathname__manifest
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        dir = Pathname(dir)
+
+        (dir + RBS::Collection::Config::PATH).write(<<~YAML)
+          sources:
+            - type: local
+              path: repo
+
+          path: #{dir.join('gem_rbs_collection')}
+        YAML
+
+        (dir/"repo/true_string/0").mkpath
+        (dir/"repo/true_string/0/manifest.yaml").write(<<~YAML)
+          dependencies:
+          - name: set
+          - name: pathname
+          - name: cgi-escape
+        YAML
+
+        bundle_install("logger", "true_string")  # true_string is a soutaro's gem that doesn't have sig directory
+
+        _stdout, stderr = run_rbs_collection("install", bundler: true)
+
+        assert_include stderr, '`set` is a part of the Ruby core library.'
+        assert_include stderr, '`pathname` is a part of the Ruby core library.'
+
+        lockfile = RBS::Collection::Config::Lockfile.from_lockfile(
+          lockfile_path: dir + "rbs_collection.lock.yaml",
+          data: YAML.safe_load((dir + "rbs_collection.lock.yaml").read)
+        )
+
+        assert_nil lockfile.gems["set"]
+        assert_nil lockfile.gems["pathname"]
+        assert_instance_of RBS::Collection::Sources::Stdlib, lockfile.gems["cgi-escape"][:source]
+        assert_instance_of RBS::Collection::Sources::Local, lockfile.gems["true_string"][:source]
+      end
+    end
+  end
+
   def test_subtract
     Dir.mktmpdir do |dir|
       dir = Pathname(dir)

test/stdlib/Method_test.rb

@@ -154,8 +154,10 @@ def test_receiver
   end
 
   def test_source_location
-    assert_send_type  '() -> [String, Integer]',
-                      METHOD, :source_location
+    if_ruby(..."4.1") do
+      assert_send_type  '() -> [String, Integer]',
+                        METHOD, :source_location
+    end
     assert_send_type  '() -> nil',
                       method(:__id__), :source_location
   end

test/stdlib/Proc_test.rb

@@ -139,8 +139,10 @@ def test_parameters
   end
 
   def test_source_location
-    assert_send_type  '() -> [String, Integer]',
-                      proc{}, :source_location
+    if_ruby(..."4.1") do
+      assert_send_type  '() -> [String, Integer]',
+                        proc{}, :source_location
+    end
     assert_send_type  '() -> nil',
                       Proc.new(&Kernel.method(:print)), :source_location
   end

test/stdlib/UnboundMethod_test.rb

@@ -89,10 +89,12 @@ def test_parameters
   end
 
   def test_source_location
-    assert_send_type  '() -> [String, Integer]?',
-                      UMETH, :source_location
-    assert_send_type  '() -> [String, Integer]?',
-                      ParamMeths.instance_method(:leading_optional), :source_location
+    if_ruby(..."4.1") do
+      assert_send_type  '() -> [String, Integer]?',
+                        UMETH, :source_location
+      assert_send_type  '() -> [String, Integer]?',
+                        ParamMeths.instance_method(:leading_optional), :source_location
+    end
   end
 
   def test_super_method