Merge branch 'master' into claude/collection-init-agent-friendly

Author: pocke

.rubocop.yml

@@ -3,7 +3,6 @@ plugins:
   - rubocop-on-rbs
 
 AllCops:
-  TargetRubyVersion: 3.4
   DisabledByDefault: true
   Exclude:
     - 'vendor/bundle/**/*'

CHANGELOG.md

@@ -1,6 +1,27 @@
 # CHANGELOG
 
-## 4.2.0.pre.1 (2026-08-18)
+## 4.2.0 (2026-08-23)
+
+RBS 4.2 accepts non-ASCII characters in identifiers. Method names, instance variable names and parameter names can be written in any script, and other names may contain non-ASCII characters as long as they start with an ASCII letter, which is what tells a constant from a method name.
+
+```rbs
+class Greeter
+  @挨拶: String
+
+  def こんにちは: () -> String
+end
+```
+
+The parser and the AST support Ruby-style `...` forwarding parameters in method types, but the layers built on top of the parser do not yet. The syntax is disabled by default in 4.2 and is not enabled by the public `RBS::Parser` API, so it cannot be used in regular RBS signatures yet.
+
+Ruby 3.2 reached EOL on 2026-04-01, and this release requires Ruby 3.3 or later. Applications on 3.2 stay on the 4.1 line.
+
+### Signature updates
+
+**Updated classes/modules/methods:** `ERB`, `ERB::DefMethod`, `IO`, `Monitor`, `MonitorMixin::ConditionVariable`, `Singleton`, `StringIO`, `Zlib::GzipFile`, `Zlib::GzipWriter`
+
+* Replace deterministic `untyped` return types with concrete types ([#2966](https://github.com/ruby/rbs/pull/2966))
+* Declare Singleton::SingletonInstanceMethods ([#3037](https://github.com/ruby/rbs/pull/3037))
 
 ### Language updates
 
@@ -10,6 +31,7 @@
 
 ### Library changes
 
+* Drop runtime support for Ruby 3.2 ([#3095](https://github.com/ruby/rbs/pull/3095))
 * Stop the lexer reading past the end of a byte_range ([#3040](https://github.com/ruby/rbs/pull/3040))
 * Exclude CR from comment tokens to fix an off-by-one Location#end_line on CRLF files ([#3069](https://github.com/ruby/rbs/pull/3069))
 * Handle the NULL parser in the WebAssembly shim ([#3085](https://github.com/ruby/rbs/pull/3085))
@@ -24,6 +46,7 @@
 
 ### Miscellaneous
 
+* Omit forwarding parameter tests on JRuby ([#3092](https://github.com/ruby/rbs/pull/3092))
 * Skip JSON 2-only tests with JSON 3 ([#3084](https://github.com/ruby/rbs/pull/3084))
 * Pin GitHub Actions to commit hashes ([#3020](https://github.com/ruby/rbs/pull/3020))
 

Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 PATH
   remote: .
   specs:
-    rbs (4.2.0.pre.1)
+    rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort

core/io.rbs

@@ -1417,7 +1417,8 @@ class IO < Object
   #
   #     AA
   #
-  def putc: (Numeric | String object) -> (Numeric | String)
+  def putc: (real) -> real
+          | (String) -> String
 
   # <!--
   #   rdoc-file=io.c

lib/rbs/prototype/helpers.rb

@@ -5,58 +5,25 @@ module Prototype
     module Helpers
       private
 
-      # Prism can't parse Ruby 3.2 code
-      if RUBY_VERSION >= "3.3"
-        def parse_comments(string, include_trailing:)
-          Prism.parse_comments(string, version: "current").yield_self do |prism_comments| # steep:ignore UnexpectedKeywordArgument
-            prism_comments.each_with_object({}) do |comment, hash| #$ Hash[Integer, AST::Comment]
-              # Skip EmbDoc comments
-              next unless comment.is_a?(Prism::InlineComment)
-              # skip like `module Foo # :nodoc:`
-              next if comment.trailing? && !include_trailing
-
-              line = comment.location.start_line
-              body = "#{comment.location.slice}\n"
-              body = body[2..-1] or raise
-              body = "\n" if body.empty?
-
-              comment = AST::Comment.new(string: body, location: nil)
-              if prev_comment = hash.delete(line - 1)
-                hash[line] = AST::Comment.new(string: prev_comment.string + comment.string,
-                                              location: nil)
-              else
-                hash[line] = comment
-              end
-            end
-          end
-        end
-      else
-        require "ripper"
-        def parse_comments(string, include_trailing:)
-          Ripper.lex(string).yield_self do |tokens|
-            code_lines = {} #: Hash[Integer, bool]
-            tokens.each.with_object({}) do |token, hash| #$ Hash[Integer, AST::Comment]
-              case token[1]
-              when :on_sp, :on_ignored_nl
-                # skip
-              when :on_comment
-                line = token[0][0]
-                # skip like `module Foo # :nodoc:`
-                next if code_lines[line] && !include_trailing
-                body = token[2][2..-1] or raise
-
-                body = "\n" if body.empty?
-
-                comment = AST::Comment.new(string: body, location: nil)
-                if prev_comment = hash.delete(line - 1)
-                  hash[line] = AST::Comment.new(string: prev_comment.string + comment.string,
-                                                location: nil)
-                else
-                  hash[line] = comment
-                end
-              else
-                code_lines[token[0][0]] = true
-              end
+      def parse_comments(string, include_trailing:)
+        Prism.parse_comments(string, version: "current").yield_self do |prism_comments| # steep:ignore UnexpectedKeywordArgument
+          prism_comments.each_with_object({}) do |comment, hash| #$ Hash[Integer, AST::Comment]
+            # Skip EmbDoc comments
+            next unless comment.is_a?(Prism::InlineComment)
+            # skip like `module Foo # :nodoc:`
+            next if comment.trailing? && !include_trailing
+
+            line = comment.location.start_line
+            body = "#{comment.location.slice}\n"
+            body = body[2..-1] or raise
+            body = "\n" if body.empty?
+
+            comment = AST::Comment.new(string: body, location: nil)
+            if prev_comment = hash.delete(line - 1)
+              hash[line] = AST::Comment.new(string: prev_comment.string + comment.string,
+                                            location: nil)
+            else
+              hash[line] = comment
             end
           end
         end

lib/rbs/prototype/runtime.rb

@@ -527,7 +527,7 @@ def generate_class(mod)
 
         generate_mixin(mod, decl, type_name, type_name_absolute)
 
-        unless mod < Struct || (RUBY_VERSION >= '3.2' && mod < Data)
+        unless mod < Struct || mod < Data
           generate_methods(mod, type_name, decl.members) unless outline
         end
 

lib/rbs/prototype/runtime/value_object_generator.rb

@@ -212,7 +212,6 @@ def build_s_keyword_init_p
 
       class DataGenerator < ValueObjectBase
         def self.generatable?(target)
-          return false unless RUBY_VERSION >= '3.2'
           return false unless target < Data
           # Avoid direct inherited class like `class Option < Data`
           return false unless target.respond_to?(:members)

lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "4.2.0.pre.1"
+  VERSION = "4.2.0"
 end

rbs.gemspec

@@ -67,14 +67,10 @@ Gem::Specification.new do |spec|
     spec.extensions = %w{ext/rbs_extension/extconf.rb}
   end
 
-  if false
-    spec.required_ruby_version = ">= 3.4"
-  end
-
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 3.2"
+  spec.required_ruby_version = ">= 3.3"
   spec.add_dependency "logger"
   spec.add_dependency "prism", ">= 1.6.0"
   spec.add_dependency "tsort"

stdlib/erb/0/erb.rbs

@@ -619,7 +619,7 @@ class ERB
   # It's good practice to choose a variable name that begins with an underscore:
   # <code>'_'</code>.
   #
-  def initialize: (String, ?eoutvar: String, ?trim_mode: Integer | String | NilClass) -> untyped
+  def initialize: (String, ?eoutvar: String, ?trim_mode: Integer | String | NilClass) -> void
 
   # <!-- rdoc-file=lib/erb.rb -->
   # Returns the Ruby code that, when executed, generates the result;
@@ -702,7 +702,7 @@ class ERB
   # Like #result, but prints the result string (instead of returning it);
   # returns `nil`.
   #
-  def run: (?Binding) -> untyped
+  def run: (?Binding) -> nil
 
   # <!--
   #   rdoc-file=lib/erb.rb
@@ -746,7 +746,7 @@ class ERB
   # class MyClass; include MyModule; end
   # MyClass.new.render('foo', 123)                      # => "foo 123"
   #
-  def def_method: (Module, String, ?String) -> untyped
+  def def_method: (Module, String, ?String) -> Symbol
 
   # <!--
   #   rdoc-file=lib/erb.rb
@@ -913,7 +913,7 @@ class ERB
     # define *methodname* as instance method of current module, using ERB object or
     # eRuby file
     #
-    def self.def_erb_method: (String methodname, (String | ERB) erb_or_fname) -> untyped
+    def self.def_erb_method: (String methodname, (String | ERB) erb_or_fname) -> Symbol
   end
 
   # <!-- rdoc-file=lib/erb/util.rb -->