rbs 3.6.0 → 3.7.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb0b6146ae3fb623941640740fb04a27f47944f69c7c8392eecbe483fdc585d
-  data.tar.gz: eac17e29129ce5d87886a3405c9a5f3e3088f1f7d4ff593e1bd4237b4d4753c6
+  metadata.gz: 86a893f83a116311b7161ef437a811c4c81adae584063b690acf0711f94eb633
+  data.tar.gz: d5cdbec208cd2c8c7671712e1e94215e1d83ea487d6eb9eca8499d0d3016b9a0
 SHA512:
-  metadata.gz: 3b41c024be368fb48a31c479a07362040e5165dd965eb60d7a9c805dbae8be1f23f16a9473922eb75965cf02ffff99beb35a9c8f27485b435e0658410abba00f
-  data.tar.gz: 193ee4fe30508c89f8c3ee548b5ab6d4839c57afacac7ef02e9aa0d0fb71c1886f87e85a2d659af03551c63c23797af7c6d54260b7be2095e74f69ca194852ce
+  metadata.gz: e17695da454b8df97db782759c1e63f7d01af6a33ec258c43ec0c1759fa6c768d83e4b9a5cd98c7229370bfad0c2865c202b06fcb86568821ec62148139fbbf0
+  data.tar.gz: 274d1c7db8d8e97e68ede7d0f21ed69b9a2403243c1f5c0e1c02429b669f3b0ff1d6c28e8c7d64b4ff658bd22c4f20b0d3318bf396e1cdd6dcca8ceca9f2bb3c

data/.github/workflows/ruby.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3', head]
+        ruby: ['3.1', '3.2', '3.3', head]
         rubyopt: [""]
         job:
           - test
@@ -34,6 +34,8 @@ jobs:
             job: rubocop validate test_doc build test_generate_stdlib raap
           - ruby: "3.3"
             job: typecheck_test
+    env:
+      RANDOMIZE_STDLIB_TEST_ORDER: "true"
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # CHANGELOG
 
-## 1.8.0 (2024-09-30)
+## 3.6.1 (2024-10-03)
+
+### Library changes
+
+* Mark as ractor-safe ([#2041](https://github.com/ruby/rbs/pull/2041))
+
+### Miscellaneous
+
+* Omit IOConsoleTest with Windows platform ([#2044](https://github.com/ruby/rbs/pull/2044))
+* Recover `$stdout` after test ([#2042](https://github.com/ruby/rbs/pull/2042))
+
+## 3.6.0 (2024-09-30)
 
 Nothing changed since `3.6.0.pre.3`.
 

data/Rakefile

@@ -63,7 +63,12 @@ task :validate => :compile do
   # Skip RBS validation because Ruby CI runs without rubygems
   case skip_rbs_validation = ENV["SKIP_RBS_VALIDATION"]
   when nil
-    libs << "rbs"
+    begin
+      Gem::Specification.find_by_name("rbs")
+      libs << "rbs"
+    rescue Gem::MissingSpecError
+      STDERR.puts "🚨🚨🚨🚨 Skipping `rbs` gem because it's not found"
+    end
   when "true"
     # Skip
   else
@@ -86,6 +91,11 @@ task :stdlib_test => :compile do
   test_files = FileList["test/stdlib/**/*_test.rb"].reject do |path|
     path =~ %r{Ractor} || path =~ %r{Encoding}
   end
+
+  if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
+    test_files.shuffle!
+  end
+
   sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test_files.join(' ')}"
   # TODO: Ractor tests need to be run in a separate process
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"

data/core/io.rbs

@@ -1638,7 +1638,7 @@ class IO < Object
   # Optional keyword argument `chomp` specifies whether line separators are to be
   # omitted.
   #
-  def readline: (?String sep, ?Integer limit) -> String
+  def readline: (?String sep, ?Integer limit, ?chomp: boolish) -> String
 
   # <!--
   #   rdoc-file=io.c
@@ -1701,7 +1701,7 @@ class IO < Object
   #     # => ["First line", "Second line", "", "Fourth line", "Fifth line"]
   #     f.close
   #
-  def readlines: (?String sep, ?Integer limit) -> ::Array[String]
+  def readlines: (?String sep, ?Integer limit, ?chomp: boolish) -> ::Array[String]
 
   # <!--
   #   rdoc-file=io.c

data/core/kernel.rbs

@@ -1209,7 +1209,7 @@ module Kernel : BasicObject
   # -->
   # Equivalent to Proc.new.
   #
-  def self?.proc: () { () -> untyped } -> Proc
+  def self?.proc: () { (?) -> untyped } -> Proc
 
   # <!--
   #   rdoc-file=proc.c

data/ext/rbs_extension/main.c

@@ -3,6 +3,9 @@
 void
 Init_rbs_extension(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+  rb_ext_ractor_safe(true);
+#endif  
   rbs__init_constants();
   rbs__init_location();
   rbs__init_parser();

data/ext/rbs_extension/parser.c

@@ -54,7 +54,7 @@ typedef struct {
 
 static VALUE EMPTY_ARRAY;
 
-static void inline melt_array(VALUE *array) {
+static inline void melt_array(VALUE *array) {
   if (*array == EMPTY_ARRAY) {
     *array = rb_ary_new();
   }

data/ext/rbs_extension/rbs_extension.h

@@ -9,14 +9,6 @@
 #include "constants.h"
 #include "ruby_objs.h"
 
-/**
- * Unescape escape sequences in the given string inplace:
- *
- *   '\\n' => "\n"
- *
- * */
-void rbs_unescape_string(VALUE string, bool dq_string);
-
 /**
  * Receives `parserstate` and `range`, which represents a string token or symbol token, and returns a string VALUE.
  *

data/lib/rbs/definition.rb

@@ -28,12 +28,18 @@ module RBS
         attr_reader :member
         attr_reader :defined_in
         attr_reader :implemented_in
+        attr_reader :member_annotations
+        attr_reader :overload_annotations
+        attr_reader :annotations
 
-        def initialize(type:, member:, defined_in:, implemented_in:)
+        def initialize(type:, member:, defined_in:, implemented_in:, overload_annotations: [])
           @type = type
           @member = member
           @defined_in = defined_in
           @implemented_in = implemented_in
+          @member_annotations = member.annotations
+          @overload_annotations = overload_annotations
+          @annotations = member.annotations + overload_annotations
         end
 
         def ==(other)
@@ -54,12 +60,8 @@ module RBS
           member.comment
         end
 
-        def annotations
-          member.annotations
-        end
-
         def update(type: self.type, member: self.member, defined_in: self.defined_in, implemented_in: self.implemented_in)
-          TypeDef.new(type: type, member: member, defined_in: defined_in, implemented_in: implemented_in)
+          TypeDef.new(type: type, member: member, defined_in: defined_in, implemented_in: implemented_in, overload_annotations: overload_annotations)
         end
 
         def overload?
@@ -82,7 +84,7 @@ module RBS
         @super_method = super_method
         @defs = defs
         @accessibility = accessibility
-        @extra_annotations = annotations
+        @extra_annotations = []
         @alias_of = alias_of
       end
 
@@ -124,7 +126,7 @@ module RBS
       end
 
       def annotations
-        @annotations ||= @extra_annotations + defs.flat_map {|d| d.annotations }
+        @annotations ||= defs.flat_map {|d| d.member_annotations }
       end
 
       def members

data/lib/rbs/definition_builder.rb

@@ -386,7 +386,8 @@ module RBS
                       type: method_type,
                       member: initialize_def.member,
                       defined_in: initialize_def.defined_in,
-                      implemented_in: initialize_def.implemented_in
+                      implemented_in: initialize_def.implemented_in,
+                      overload_annotations: initialize_def.overload_annotations
                     )
                   end,
                   accessibility: :public,
@@ -641,7 +642,8 @@ module RBS
             type: subst.empty? ? overload.method_type : overload.method_type.sub(subst),
             member: original,
             defined_in: defined_in,
-            implemented_in: implemented_in
+            implemented_in: implemented_in,
+            overload_annotations: overload.annotations
           )
         end
 
@@ -750,7 +752,8 @@ module RBS
             type: subst.empty? ? overload.method_type : overload.method_type.sub(subst),
             member: overloading_def,
             defined_in: defined_in,
-            implemented_in: implemented_in
+            implemented_in: implemented_in,
+            overload_annotations: overload.annotations
           )
 
           method_definition.defs.unshift(type_def)

data/lib/rbs/test/hook.rb

@@ -96,50 +96,55 @@ def #{with_name}(#{param_source.join(", ")}, &#{block_param})
     block_calls = []
 
     if block_given?
-      receiver = self
       block_receives_block = #{block_param}.parameters.last&.yield_self {|type, _| type == :block }
 
-      wrapped_block = proc do |*block_args, &block2|
-        return_from_block = false
-
-        begin
-          block_result = if receiver.equal?(self)
-                           if block_receives_block
-                             #{block_param}.call(*block_args, &block2)
-                           else
-                             yield(*block_args)
-                           end
-                         else
-                           instance_exec(*block_args, &#{block_param})
-                         end
-
-          return_from_block = true
-        ensure
-          exn = $!
-
-          case
-          when return_from_block
-            # Returned from yield
-            block_calls << ::RBS::Test::ArgumentsReturn.return(
-              arguments: block_args,
-              value: block_result
-            )
-          when exn
-            # Exception
-            block_calls << ::RBS::Test::ArgumentsReturn.exception(
-              arguments: block_args,
-              exception: exn
-            )
-          else
-            # break?
-            block_calls << ::RBS::Test::ArgumentsReturn.break(
-              arguments: block_args
-            )
+      wrapped_block = Object.new.instance_exec do
+        new_object = self
+
+        proc do |*block_args, &block2|
+          return_from_block = false
+
+          begin
+            block_result = if self.equal?(new_object)
+                            if block_receives_block
+                              #{block_param}.call(*block_args, &block2)
+                            else
+                              yield(*block_args)
+                            end
+                          else
+                            # Detected that `self` inside `proc` is not equal to the `self` outside block (which is saved to `new_object`).
+                            # This means that the block is called with `instance_exec` or `instance_eval`.
+                            self.instance_exec(*block_args, &#{block_param})
+                          end
+
+            return_from_block = true
+          ensure
+            exn = $!
+
+            case
+            when return_from_block
+              # Returned from yield
+              block_calls << ::RBS::Test::ArgumentsReturn.return(
+                arguments: block_args,
+                value: block_result
+              )
+            when exn
+              # Exception
+              block_calls << ::RBS::Test::ArgumentsReturn.exception(
+                arguments: block_args,
+                exception: exn
+              )
+            else
+              # break?
+              block_calls << ::RBS::Test::ArgumentsReturn.break(
+                arguments: block_args
+              )
+            end
           end
-        end
 
-        block_result
-      end.ruby2_keywords
+          block_result
+        end.ruby2_keywords
+      end
 
       result = __send__(:"#{without_name}", *args, &wrapped_block)
     else

data/lib/rbs/types.rb

@@ -1221,6 +1221,12 @@ module RBS
         end
       end
 
+      def map_type_name(&block)
+        UntypedFunction.new(
+          return_type: return_type.map_type_name(&block)
+        )
+      end
+
       def each_type(&block)
         if block
           yield return_type

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.6.0"
+  VERSION = "3.7.0.dev.1"
 end

data/rbs.gemspec

@@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
   spec.add_dependency "logger"
 end

data/sig/definition.rbs

@@ -21,11 +21,18 @@ module RBS
         attr_reader defined_in: TypeName
         attr_reader implemented_in: TypeName?
 
-        def initialize: (type: MethodType, member: method_member, defined_in: TypeName, implemented_in: TypeName?) -> void
+        # Annotations given to `#member`
+        attr_reader member_annotations: Array[AST::Annotation]
 
-        def comment: () -> AST::Comment?
+        # Annotations given to the overload associated to the method type
+        attr_reader overload_annotations: Array[AST::Annotation]
+
+        # Concatnation of `member_annotations` and `overload_annotations`
+        attr_reader annotations: Array[AST::Annotation]
 
-        def annotations: () -> Array[AST::Annotation]
+        def initialize: (type: MethodType, member: method_member, defined_in: TypeName, implemented_in: TypeName?, ?overload_annotations: Array[AST::Annotation]) -> void
+
+        def comment: () -> AST::Comment?
 
         def update: (?type: MethodType, ?member: method_member, ?defined_in: TypeName, ?implemented_in: TypeName?) -> TypeDef
 
@@ -35,15 +42,23 @@ module RBS
       attr_reader super_method: Method?
       attr_reader defs: Array[TypeDef]
       attr_reader accessibility: accessibility
-      attr_reader extra_annotations: Array[AST::Annotation]
+
       attr_reader defined_in: TypeName?
       attr_reader implemented_in: TypeName?
       attr_reader method_types: Array[MethodType]
       attr_reader comments: Array[AST::Comment]
-      attr_reader annotations: Array[AST::Annotation]
+
       attr_reader members: Array[method_member]
       attr_reader alias_of: Method?
 
+      # Unused, always returns empty array
+      attr_reader extra_annotations: Array[AST::Annotation]
+
+      # Union of annotations given to `defs`, not contains annotations given to each overload
+      attr_reader annotations: Array[AST::Annotation]
+
+      # Note that the annotations given through `annotations:` keyword is ignored.
+      #
       def initialize: (super_method: Method?,
                        defs: Array[TypeDef],
                        accessibility: accessibility,

data/stdlib/cgi/0/core.rbs

@@ -360,7 +360,7 @@ class CGI
   # -->
   # Return the accept character set for all new CGI instances.
   #
-  def self.accept_charset: () -> String
+  def self.accept_charset: () -> encoding
 
   # <!--
   #   rdoc-file=lib/cgi/core.rb
@@ -368,7 +368,7 @@ class CGI
   # -->
   # Set the accept character set for all new CGI instances.
   #
-  def self.accept_charset=: (String accept_charset) -> String
+  def self.accept_charset=: (encoding accept_charset) -> encoding
 
   # <!--
   #   rdoc-file=lib/cgi/core.rb
@@ -385,7 +385,7 @@ class CGI
   # <!-- rdoc-file=lib/cgi/core.rb -->
   # Return the accept character set for this CGI instance.
   #
-  attr_reader accept_charset: String
+  attr_reader accept_charset: encoding
 
   # <!-- rdoc-file=lib/cgi/core.rb -->
   # This method is an alias for #http_header, when HTML5 tag maker is inactive.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0.dev.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -525,14 +525,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Type signature for Ruby.