Merge branch 'master' into rubocop-on-rbs

Author: soutaro

.github/workflows/dependabot.yml

@@ -11,8 +11,11 @@ env:
 jobs:
   dependabot:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
     steps:
+      - name: Dependabot metadata
+        uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
+        id: metadata
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -21,6 +24,7 @@ jobs:
         run: git diff --exit-code ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} ${{ env.blocker_files }}
       - name: Enable auto-merge for Dependabot PRs
         run: gh pr merge --auto --merge "$PR_URL"
+        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.DEPENDABOT_MERGE_GH_TOKEN}}

.github/workflows/ruby.yml

@@ -42,6 +42,8 @@ jobs:
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
+      - name: Set up permission
+        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.5.1)
+    rbs (3.6.0.dev.1)
       logger
 
 PATH
@@ -13,7 +13,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     abbrev (0.1.2)
-    activesupport (7.1.3.4)
+    activesupport (7.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -23,13 +23,13 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
-    benchmark-ips (2.13.0)
+    benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     csv (3.3.0)
     dbm (1.1.0)
@@ -47,34 +47,34 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
-    json-schema (4.3.0)
-      addressable (>= 2.8)
+    json-schema (5.0.0)
+      addressable (~> 2.8)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
+    logger (1.6.1)
     marcel (1.0.4)
     memory_profiler (1.0.2)
-    minitest (5.23.1)
+    minitest (5.25.1)
     mutex_m (0.2.0)
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.0)
       net-protocol
     nkf (0.2.0)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     power_assert (2.0.3)
     psych (4.0.6)
       stringio
-    public_suffix (5.1.0)
-    raap (0.8.0)
+    public_suffix (6.0.1)
+    raap (1.0.0)
       rbs (~> 3.0)
       timeout (~> 0.4)
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
@@ -85,33 +85,30 @@ GEM
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    rexml (3.3.0)
-      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-on-rbs (0.6.0)
       rbs (~> 3.5)
@@ -188,4 +185,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.4.18
+   2.5.16

core/array.rbs

@@ -1082,7 +1082,7 @@ class Array[unchecked out Elem] < Object
   #     a.at(0) # => :foo
   #     a.at(2) # => 2
   #
-  def at: (int index) -> Elem?
+  def at: %a{implicitly-returns-nil} (int index) -> Elem
 
   # <!--
   #   rdoc-file=array.c
@@ -1378,7 +1378,7 @@ class Array[unchecked out Elem] < Object
   #
   # If `index` is too small (far from zero), returns nil.
   #
-  def delete_at: (int index) -> Elem?
+  def delete_at: %a{implicitly-returns-nil} (int index) -> Elem
 
   # <!--
   #   rdoc-file=array.c
@@ -1942,7 +1942,7 @@ class Array[unchecked out Elem] < Object
   #
   # Related: #last.
   #
-  def first: () -> Elem?
+  def first: %a{implicitly-returns-nil} () -> Elem
            | (int n) -> ::Array[Elem]
 
   # <!--
@@ -2241,7 +2241,7 @@ class Array[unchecked out Elem] < Object
   #
   # Related: #first.
   #
-  def last: () -> Elem?
+  def last: %a{implicitly-returns-nil} () -> Elem
           | (int n) -> ::Array[Elem]
 
   # <!--
@@ -2321,8 +2321,8 @@ class Array[unchecked out Elem] < Object
   #
   #     ['0', '00', '000'].max(2) {|a, b| a.size <=> b.size } # => ["000", "00"]
   #
-  def max: () -> Elem?
-         | () { (Elem a, Elem b) -> ::Integer? } -> Elem?
+  def max: %a{implicitly-returns-nil} () -> Elem
+         | %a{implicitly-returns-nil} () { (Elem a, Elem b) -> ::Integer? } -> Elem
          | (int n) -> ::Array[Elem]
          | (int n) { (Elem a, Elem b) -> ::Integer? } -> ::Array[Elem]
 
@@ -3118,7 +3118,7 @@ class Array[unchecked out Elem] < Object
   #     a.sample(random: Random.new(1))     #=> 6
   #     a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
   #
-  def sample: (?random: _Rand rng) -> Elem?
+  def sample: %a{implicitly-returns-nil} (?random: _Rand rng) -> Elem
             | (int n, ?random: _Rand rng) -> ::Array[Elem]
 
   # <!--
@@ -3197,7 +3197,7 @@ class Array[unchecked out Elem] < Object
   #
   # Related: #push, #pop, #unshift.
   #
-  def shift: () -> Elem?
+  def shift: %a{implicitly-returns-nil} () -> Elem
            | (int n) -> ::Array[Elem]
 
   # <!--
@@ -3323,7 +3323,7 @@ class Array[unchecked out Elem] < Object
   #     # Raises TypeError (no implicit conversion of Symbol into Integer):
   #     a[:foo]
   #
-  def slice: (int index) -> Elem?
+  def slice: %a{implicitly-returns-nil} (int index) -> Elem
            | (int start, int length) -> ::Array[Elem]?
            | (::Range[::Integer] range) -> ::Array[Elem]?
 
@@ -3393,7 +3393,7 @@ class Array[unchecked out Elem] < Object
   #     a.slice!(-2..2) # => ["bar", 2]
   #     a # => [:foo]
   #
-  def slice!: (int index) -> Elem?
+  def slice!: %a{implicitly-returns-nil} (int index) -> Elem
             | (int start, int length) -> ::Array[Elem]?
             | (::Range[::Integer] range) -> ::Array[Elem]?
 

core/basic_object.rbs

@@ -163,7 +163,7 @@ class BasicObject
   #     k = Klass.new
   #     k.send :hello, "gentle", "readers"   #=> "Hello gentle readers"
   #
-  def __send__: (interned name, *untyped, **untyped) ?{ (*untyped, **untyped) -> untyped } -> untyped
+  def __send__: (interned name, *untyped, **untyped) ?{ (?) -> untyped } -> untyped
 
   # <!-- rdoc-file=object.c -->
   # Equality --- At the Object level, #== returns `true` only if `obj` and `other`
@@ -248,7 +248,7 @@ class BasicObject
   #     k = KlassWithSecret.new
   #     k.instance_exec(5) {|x| @secret+x }   #=> 104
   #
-  def instance_exec: [U, V] (*V args) { (*V args) [self: self] -> U } -> U
+  def instance_exec: [U] (*untyped, **untyped) { (?) [self: self] -> U } -> U
 
   # <!--
   #   rdoc-file=object.c
@@ -295,7 +295,7 @@ class BasicObject
   #     r.mm      #=> 2000
   #     r.foo     #=> NoMethodError
   #
-  def method_missing: (Symbol, *untyped, **untyped) ?{ (*untyped, **untyped) -> untyped } -> untyped
+  def method_missing: (Symbol, *untyped, **untyped) ?{ (?) -> untyped } -> untyped
 
   # <!--
   #   rdoc-file=object.c

core/enumerable.rbs

@@ -528,6 +528,12 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #
   def entries: () -> ::Array[Elem]
 
+  def enum_for: (Symbol method, *untyped, **untyped) ?{ (?) -> Integer } -> Enumerator[untyped, untyped]
+    | () ?{ () -> Integer } -> Enumerator[Elem, self]
+
+  %a{annotate:rdoc:skip}
+  alias to_enum enum_for
+
   # <!--
   #   rdoc-file=enum.c
   #   - select {|element| ... } -> array
@@ -1293,7 +1299,7 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   # With no block given, returns an Enumerator.
   #
   def reverse_each: () { (Elem arg0) -> untyped } -> void
-                  | () -> ::Enumerator[Elem, void]
+                  | () -> ::Enumerator[Elem]
 
   # <!--
   #   rdoc-file=enum.c
@@ -1754,7 +1760,7 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #     # show pythagorean triples less than 100
   #     p pythagorean_triples.take_while { |*, z| z < 100 }.force
   #
-  def lazy: () -> Enumerator::Lazy[Elem, void]
+  def lazy: () -> Enumerator::Lazy[Elem]
 
   # <!--
   #   rdoc-file=enum.c
@@ -1840,7 +1846,7 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #     e = (1..3).chain([4, 5])
   #     e.to_a #=> [1, 2, 3, 4, 5]
   #
-  def chain: (*self enumerables) -> ::Enumerator::Chain[Elem]
+  def chain: [Elem2] (*_Each[Elem2] enumerables) -> ::Enumerator::Chain[Elem | Elem2]
 
   # <!--
   #   rdoc-file=enum.c
@@ -2086,8 +2092,8 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #       pp lines
   #     }
   #
-  def chunk: [U] () { (Elem elt) -> U } -> ::Enumerator[[ U, ::Array[Elem] ], void]
-           | () -> ::Enumerator[Elem, ::Enumerator[[ untyped, ::Array[Elem] ], void]]
+  def chunk: [U] () { (Elem elt) -> U } -> ::Enumerator[[ U, ::Array[Elem] ]]
+           | () -> ::Enumerator[Elem, ::Enumerator[[ untyped, ::Array[Elem] ]]]
 
   # <!--
   #   rdoc-file=enum.c
@@ -2136,7 +2142,7 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   # Enumerable#slice_when does the same, except splitting when the block returns
   # `true` instead of `false`.
   #
-  def chunk_while: () { (Elem elt_before, Elem elt_after) -> boolish } -> ::Enumerator[::Array[Elem], void]
+  def chunk_while: () { (Elem elt_before, Elem elt_after) -> boolish } -> ::Enumerator[::Array[Elem]]
 
   # <!--
   #   rdoc-file=enum.c
@@ -2198,7 +2204,7 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   # Enumerable#chunk_while does the same, except splitting when the block returns
   # `false` instead of `true`.
   #
-  def slice_when: () { (Elem elt_before, Elem elt_after) -> boolish } -> ::Enumerator[::Array[Elem], void]
+  def slice_when: () { (Elem elt_before, Elem elt_after) -> boolish } -> ::Enumerator[::Array[Elem]]
 
   # <!--
   #   rdoc-file=enum.c
@@ -2233,8 +2239,8 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #     p e.map {|ll| ll[0...-1].map {|l| l.sub(/\\\n\z/, "") }.join + ll.last }
   #     #=>["foo\n", "barbaz\n", "\n", "qux\n"]
   #
-  def slice_after: (untyped pattern) -> ::Enumerator[::Array[Elem], void]
-                 | () { (Elem elt) -> boolish } -> ::Enumerator[::Array[Elem], void]
+  def slice_after: (untyped pattern) -> ::Enumerator[::Array[Elem]]
+                 | () { (Elem elt) -> boolish } -> ::Enumerator[::Array[Elem]]
 
   # <!--
   #   rdoc-file=enum.c
@@ -2390,6 +2396,6 @@ module Enumerable[unchecked out Elem] : _Each[Elem]
   #       }
   #     }
   #
-  def slice_before: (untyped pattern) -> ::Enumerator[::Array[Elem], void]
-                  | () { (Elem elt) -> boolish } -> ::Enumerator[::Array[Elem], void]
+  def slice_before: (untyped pattern) -> ::Enumerator[::Array[Elem]]
+                  | () { (Elem elt) -> boolish } -> ::Enumerator[::Array[Elem]]
 end

core/enumerator.rbs

@@ -127,9 +127,16 @@
 #     puts ext_each(o.to_enum) {|*x| puts x; [:b, *x] }
 #     # => [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
 #
-class Enumerator[unchecked out Elem, out Return] < Object
+class Enumerator[unchecked out Elem, out Return = void] < Object
   include Enumerable[Elem]
 
+  # A convenience interface for `each` with optional block
+  #
+  interface _Each[out E, out R]
+    def each: () { (E) -> void } -> R
+            | () -> Enumerator[E, R]
+  end
+
   # <!--
   #   rdoc-file=enumerator.c
   #   - Enumerator.produce(initial = nil) { |prev| block } -> enumerator
@@ -560,7 +567,7 @@ end
 #     # This returns an array of items like a normal enumerator does.
 #     all_checked = active_items.select(&:checked)
 #
-class Enumerator::Lazy[out Elem, out Return] < Enumerator[Elem, Return]
+class Enumerator::Lazy[out Elem, out Return = void] < Enumerator[Elem, Return]
   # <!-- rdoc-file=enumerator.c -->
   # Expands `lazy` enumerator to an array. See Enumerable#to_a.
   #

core/enumerator/product.rbs

@@ -1,5 +1,5 @@
 %a{annotate:rdoc:skip}
-class Enumerator[unchecked out Elem, out Return]
+class Enumerator[unchecked out Elem, out Return = void]
   # <!-- rdoc-file=enumerator.c -->
   # Enumerator::Product generates a Cartesian product of any number of enumerable
   # objects.  Iterating over the product of enumerable objects is roughly

core/fiber.rbs

@@ -268,7 +268,7 @@ class Fiber < Object
   # Explicitly using `storage: true` is currently experimental and may change in
   # the future.
   #
-  def initialize: (?blocking: boolish, ?storage: true | Hash[interned, untyped] | nil) { (*untyped) -> void } -> void
+  def initialize: (?blocking: boolish, ?storage: true | Hash[interned, untyped] | nil) { (?) -> void } -> void
 
   # <!--
   #   rdoc-file=cont.c