Merge pull request #2730 from ksss/backport-pathname

Author: ksss

README.md

@@ -141,7 +141,7 @@ require "rbs"
 loader = RBS::EnvironmentLoader.new()
 
 # loader.add(path: Pathname("sig"))   # Load .rbs files from `sig` directory
-# loader.add(library: "pathname")     # Load pathname library
+# loader.add(library: "logger")       # Load logger library
 
 environment = RBS::Environment.from_loader(loader).resolve_type_names
 

Rakefile

@@ -328,7 +328,7 @@ namespace :generate do
           class <%= target %>SingletonTest < Test::Unit::TestCase
             include TestHelper
 
-            # library "pathname", "securerandom"     # Declare library signatures to load
+            # library "logger", "securerandom"     # Declare library signatures to load
             testing "singleton(::<%= target %>)"
 
           <%- class_methods.each do |method_name, definition| -%>
@@ -347,7 +347,7 @@ namespace :generate do
           class <%= target %>Test < Test::Unit::TestCase
             include TestHelper
 
-            # library "pathname", "securerandom"     # Declare library signatures to load
+            # library "logger", "securerandom"     # Declare library signatures to load
             testing "::<%= target %>"
 
           <%- instance_methods.each do |method_name, definition| -%>

stdlib/pathname/0/pathname.rbs core/pathname.rbsstdlib/pathname/0/pathname.rbs renamed to core/pathname.rbs

@@ -159,9 +159,9 @@ For example:
 # manifest.yaml
 
 dependencies:
-  # If your gem depends on pathname but the gemspec doesn't include pathname,
+  # If your gem depends on logger but the gemspec doesn't include logger,
   # you need to write the following.
-  - name: pathname
+  - name: logger
 ```
 
 If the gem's RBS is managed with [ruby/gem_rbs_collection](https://github.com/ruby/gem_rbs_collection), put it as `gems/GEM_NAME/VERSION/manifest.yaml`.  For example, `gems/activesupport/6.0/manifest.yaml`.

docs/collection.md

@@ -34,7 +34,6 @@ dependencies:
   - name: json
   - name: logger
   - name: optparse
-  - name: pathname
   - name: rdoc
   - name: tsort
 ```

docs/gem.md

@@ -131,10 +131,10 @@ You may need to specify `-r` or `-I` to load signatures.
 The default is `-I sig`.
 
 ```shell
-RBS_TEST_OPT='-r pathname -I sig'
+RBS_TEST_OPT='-r logger -I sig'
 ```
 
-Replacing `pathname` with the `stdlib` you want to include. For example, if you need to load `Set` and `BigDecimal` in `stdlib`, you would need to have `RBS_TEST_OPT='-r set -r bigdecimal -I sig'`
+Replacing `logger` with the `stdlib` you want to include. For example, if you need to load `Set` and `BigDecimal` in `stdlib`, you would need to have `RBS_TEST_OPT='-r set -r bigdecimal -I sig'`
 
 `RBS_TEST_LOGLEVEL` can be used to configure log level. Defaults to `info`.
 
@@ -148,7 +148,7 @@ So, a typical command line to start the test would look like the following:
 $ RBS_TEST_LOGLEVEL=error \
   RBS_TEST_TARGET='Kaigi::*' \
   RBS_TEST_SKIP='Kaigi::MonkeyPatch' \
-  RBS_TEST_OPT='-rset -rpathname -Isig -Iprivate' \
+  RBS_TEST_OPT='-rlogger -Isig -Iprivate' \
   RBS_TEST_RAISE=true \
   RUBYOPT='-rbundler/setup -rrbs/test/setup' \
   bundle exec rake test

docs/sigs.md

@@ -947,7 +947,7 @@ def run_annotate(args, options)
 
 Examples:
 
-  $ rbs annotate stdlib/pathname/**/*.rbs
+  $ rbs annotate stdlib/logger/**/*.rbs
 
 Options:
         EOB

lib/rbs/cli.rb

@@ -51,7 +51,7 @@ def add(path: nil, library: nil, version: nil, resolve_dependencies: true)
         dirs << path
       when library
         case library
-        when 'rubygems', 'set'
+        when 'pathname'
           RBS.logger.warn "`#{library}` has been moved to core library, so it is always loaded. Remove explicit loading `#{library}`"
           return
         end

lib/rbs/environment_loader.rb

@@ -1,6 +1,5 @@
 dependencies:
   - name: logger
-  - name: pathname
   - name: json
   - name: optparse
   - name: tsort

sig/manifest.yaml

@@ -1,2 +1,2 @@
 dependencies:
-  - name: pathname
+  - name: logger