Merge branch 'master' into enumerator-chain

Author: soutaro

.github/workflows/windows.yml

@@ -27,8 +27,12 @@ jobs:
         run: |
           ruby -e '
             exit if "${{ matrix.ruby }}" != "ucrt" && "${{ matrix.ruby }}" != "mswin"
-            bundled_gems = Dir.glob("D:/ruby-${{ matrix.ruby }}/lib/ruby/gems/*/cache/*.gem")
-              .map { |path| File.basename(path, ".gem")[/^(.+)-[^-]+$/, 1] }
+
+            require "open-uri"
+            require "json"
+
+            res = URI.parse("https://stdgems.org/bundled_gems.json").read
+            bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
             system "gem uninstall #{bundled_gems.join(" ")}", exception: true
           '
       - name: bundle install

.rubocop.yml

@@ -46,12 +46,16 @@ RBS/Style:
     - 'test/**/*'
 RBS/Style/BlockReturnBoolish:
   Enabled: true
+RBS/Style/ClassWithSingleton:
+  Enabled: true
 RBS/Style/DuplicatedType:
   Enabled: true
 RBS/Style/EmptyArgument:
   Enabled: true
 RBS/Style/InitializeReturnType:
   Enabled: true
+RBS/Style/InstanceWithInstance:
+  Enabled: true
 RBS/Style/OptionalNil:
   Enabled: true
 RBS/Style/RedundantParentheses:

Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     connection_pool (2.5.0)
     csv (3.3.2)
     dbm (1.1.0)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     digest (3.2.0)
     drb (2.2.1)
     ffi (1.17.1)
@@ -48,27 +48,28 @@ GEM
       strong_json (>= 1.1, < 2.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.10.1)
     json-schema (5.1.1)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
+    logger (1.6.6)
     marcel (1.0.4)
     memory_profiler (1.1.0)
     minitest (5.25.4)
     mutex_m (0.3.0)
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nkf (0.2.0)
     ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     pathname (0.4.0)
@@ -77,7 +78,7 @@ GEM
     psych (4.0.6)
       stringio
     public_suffix (6.0.1)
-    raap (1.1.0)
+    raap (1.2.0)
       rbs (~> 3.0)
       timeout (~> 0.4)
     racc (1.8.1)
@@ -95,7 +96,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -104,28 +105,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.71.0)
+    rubocop (1.72.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
-    rubocop-on-rbs (1.3.0)
+    rubocop-on-rbs (1.4.2)
       rbs (~> 3.5)
       rubocop (~> 1.61)
       zlib
-    rubocop-rubycw (0.1.6)
-      rubocop (~> 1.0)
+    rubocop-rubycw (0.2.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72.1)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     stackprof (0.2.27)
-    steep (1.9.3)
+    steep (1.9.4)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -141,7 +144,7 @@ GEM
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
       uri (>= 0.12.0)
-    stringio (3.1.2)
+    stringio (3.1.5)
     strong_json (2.1.2)
     strscan (3.1.2)
     tempfile (0.3.1)
@@ -153,7 +156,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
-    uri (1.0.2)
+    uri (1.0.3)
     zlib (3.2.1)
 
 PLATFORMS

Rakefile

@@ -139,7 +139,9 @@ task :typecheck_test => :compile do
 end
 
 task :raap => :compile do
-  sh %q[ruby test/raap.rb | xargs bundle exec raap -r digest/bubblebabble --library digest --allow-private]
+  sh "ruby test/raap/core.rb"
+  sh "ruby test/raap/digest.rb"
+  sh "ruby test/raap/openssl.rb"
 end
 
 task :rubocop do

core/data.rbs

@@ -411,5 +411,5 @@ class Data
   #     out = origin.with(z: 1) # ArgumentError: unknown keyword: :z
   #     some_point = origin.with(1, 2) # ArgumentError: expected keyword arguments, got positional arguments
   #
-  def with: (**untyped) -> instance
+  def with: (**untyped) -> self
 end

core/exception.rbs

@@ -270,7 +270,7 @@ class Exception
   #     x0..equal?(x1)            # => false
   #
   def exception: (?self) -> self
-               | (string | _ToS message) -> instance
+               | (string | _ToS message) -> self
 
   # <!--
   #   rdoc-file=error.c

core/io.rbs

@@ -3251,6 +3251,10 @@ class IO < Object
   #     f.close
   #
   alias to_i fileno
+
+  interface _ForFd[RET]
+    def for_fd: (?) -> RET
+  end
 end
 
 IO::APPEND: Integer

core/method.rbs

@@ -54,7 +54,7 @@ class Method
   #
   def hash: () -> Integer
 
-  def dup: () -> instance
+  def dup: () -> self
 
   # <!--
   #   rdoc-file=proc.c
@@ -252,7 +252,7 @@ class Method
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c

core/module.rbs

@@ -731,8 +731,8 @@ class Module < Object
   #     I'm Dino!
   #     #<B:0x401b39e8>
   #
-  def define_method: (interned symbol, ^() [self: instance] -> untyped | Method | UnboundMethod method) -> Symbol
-                   | (interned symbol) { () [self: instance] -> untyped } -> Symbol
+  def define_method: (interned symbol, ^() [self: self] -> untyped | Method | UnboundMethod method) -> Symbol
+                   | (interned symbol) { () [self: self] -> untyped } -> Symbol
 
   # <!--
   #   rdoc-file=object.c
@@ -1164,7 +1164,7 @@ class Module < Object
   # -->
   # Returns the name of the module *mod*.  Returns `nil` for anonymous modules.
   #
-  def name: () -> String?
+  def name: %a{implicitly-returns-nil} () -> String
 
   # <!--
   #   rdoc-file=eval.c

core/proc.rbs

@@ -376,8 +376,8 @@ class Proc
   #
   def self.new: () { (?) -> untyped } -> instance
 
-  def clone: () -> instance
-  def dup: () -> instance
+  def clone: () -> self
+  def dup: () -> self
 
   # <!-- rdoc-file=proc.c -->
   # Invokes the block, setting the block's parameters to the values in *params*

core/rubygems/version.rbs

@@ -221,7 +221,7 @@ module Gem
     #
     # Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
     #
-    def bump: () -> instance
+    def bump: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb
@@ -274,7 +274,7 @@ module Gem
     # The release for this version (e.g. 1.2.0.a -> 1.2.0). Non-prerelease versions
     # return themselves.
     #
-    def release: () -> instance
+    def release: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb

core/string.rbs

@@ -1936,7 +1936,7 @@ class String
     ?crlf_newline: boolish,
     ?lf_newline: boolish,
     ?fallback: ^(String) -> string? | Method | _EncodeFallbackAref
-  ) -> instance
+  ) -> self
 
   interface _EncodeFallbackAref
     def []: (String) -> string?

core/unbound_method.rbs

@@ -100,7 +100,7 @@ class UnboundMethod
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c

lib/rbs/cli/validate.rb

@@ -196,6 +196,7 @@ def validate_class_module_definition
                   end
                 InvalidTypeApplicationError.check!(type_name: member.name, params: params, args: member.args, location: member.location)
               when AST::Members::Var
+                @validator.validate_variable(member)
                 void_type_context_validator(member.type)
                 if member.is_a?(AST::Members::ClassVariable)
                   no_self_type_validator(member.type)

lib/rbs/collection/config/lockfile_generator.rb

@@ -161,11 +161,6 @@ def generate
           return if lockfile.gems.key?(name)
 
           case name
-          when 'rubygems', 'set'
-            msg = "`#{name}` has been moved to core library, so it is always loaded. Remove explicit loading `#{name}`"
-            msg << " from `#{from_gem}`" if from_gem
-            msg << "."
-            return
           when *ALUMNI_STDLIBS.keys
             version = ALUMNI_STDLIBS.fetch(name)
             if from_gem

lib/rbs/definition.rb

@@ -6,11 +6,13 @@ class Variable
       attr_reader :parent_variable
       attr_reader :type
       attr_reader :declared_in
+      attr_reader :source
 
-      def initialize(parent_variable:, type:, declared_in:)
+      def initialize(parent_variable:, type:, declared_in:, source:)
         @parent_variable = parent_variable
         @type = type
         @declared_in = declared_in
+        @source = source
       end
 
       def sub(s)
@@ -19,7 +21,8 @@ def sub(s)
         self.class.new(
           parent_variable: parent_variable,
           type: type.sub(s),
-          declared_in: declared_in
+          declared_in: declared_in,
+          source: source
         )
       end
     end