rbs 3.5.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc7a972ca885618f8bcb3beb35d5096ddd9cc3dc6880fb6ae6b06d4a1845be0
-  data.tar.gz: 3fd84cf6a4869385f16e98cb1319855fcc1fcc242e16731b6bbdd5d249f1df8a
+  metadata.gz: cd93b9bdce0e6148409689ba4aa2db4d34109e46b799706b6f44944134f1b817
+  data.tar.gz: 3780dcddba54316cf7cb97224f7dc7a187195904a3f21cc430a017c03d663387
 SHA512:
-  metadata.gz: 0b79dcac9fa9f94eff95b2c098208784f45e8ee891b94202f8e82886d15e0af04bbb26acdff5428277470536cfef164f79b5a1f73ded288b320600bd15568500
-  data.tar.gz: c0c6f53213e0b0aac09747c2aef470548b2b872b8ace2647ebdedca292a55b8aa0dbbebfa5c3ff75c47d3f76e87643f23f75883cacc49726fd778f95e1c3ee9e
+  metadata.gz: 786d469a57422f169e2980a4b0f80eb4ec857081f51b2c56ac87e070abd118b4245f537457de06058ef32ea394742e9bcb3cd106c7d3408b51a0aab8a622a260
+  data.tar.gz: 7b70ac096f7d53171b5aebcafc6605426e80ee598cddabb70c520b689cc07fadbaa22bda3d2bd9f6a748587cc6ce11246c3a79f50125ea102cf561ed66bfc353

data/.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}}

data/.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
@@ -76,21 +78,3 @@ jobs:
       - name: Run test
         run: |
           bundle exec rake ${{ matrix.job }}
-
-  windows:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2019, windows-2022]
-        ruby: [ucrt, mswin]
-    steps:
-      - uses: actions/checkout@v4
-      - name: load ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: rake-compiler
-        run: gem install rake-compiler
-      - name: compile
-        run: rake compile

data/.github/workflows/windows.yml

@@ -0,0 +1,26 @@
+name: Ruby on Windows
+
+on:
+  push:
+    branches:
+      - master
+  pull_request: {}
+  merge_group: {}
+
+jobs:
+  compile:
+    runs-on: "windows-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.2', '3.3', ucrt, mswin]
+    steps:
+      - uses: actions/checkout@v4
+      - name: load ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: rake-compiler
+        run: gem install rake-compiler
+      - name: compile
+        run: rake compile

data/.rubocop.yml

@@ -1,4 +1,7 @@
-require: rubocop-rubycw
+require:
+  - rubocop-rubycw
+  - rubocop-on-rbs
+
 AllCops:
   TargetRubyVersion: 3.0
   DisabledByDefault: true
@@ -8,6 +11,30 @@ Rubycw/Rubycw:
   Enabled: true
   Exclude:
     - 'test/**/*_test.rb'
+    - 'test/typecheck/**/*.rb'
+
+RBS:
+  Enabled: true
+RBS/Layout:
+  Enabled: true
+  Exclude:
+    - 'sig/**/*'
+    - 'test/**/*'
+RBS/Layout/CommentIndentation:
+  Exclude:
+    - core/string.rbs
+RBS/Lint:
+  Enabled: true
+  Exclude:
+    - 'sig/**/*'
+    - 'test/**/*'
+RBS/Style:
+  Enabled: false
+  Exclude:
+    - 'sig/**/*'
+    - 'test/**/*'
+RBS/Style/InitializeReturnType:
+  Enabled: true
 
 Lint/DuplicateMethods:
   Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,128 @@
 # CHANGELOG
 
+## 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`.
+
+## 3.6.0.pre.3 (2024-09-30)
+
+### Signature updates
+
+* `JSON.load_file`, `.load_file!` ([#2031](https://github.com/ruby/rbs/pull/2031))
+* `Module#class_eval`, `Module#module_eval` ([#2029](https://github.com/ruby/rbs/pull/2029))
+* `Open3` ([#2014](https://github.com/ruby/rbs/pull/2014))
+* `RubyVM::InstructionSequence` ([#2027](https://github.com/ruby/rbs/pull/2027))
+* Fixup RBS type definitions with rbs-on-rubocop ([#2023](https://github.com/ruby/rbs/pull/2023))
+* Avoid using `instance`/`class` types in modules ([#2020](https://github.com/ruby/rbs/pull/2020))
+
+### Language updates
+
+* Optional type param restriction ([#2030](https://github.com/ruby/rbs/pull/2030))
+* Prohibit `self` type as a generics default ([#2022](https://github.com/ruby/rbs/pull/2022))
+* Allow `self` types in generics default type ([#2021](https://github.com/ruby/rbs/pull/2021))
+
+### Library changes
+
+* Add `TypeParamDefaultReferenceError#type_param` ([#2032](https://github.com/ruby/rbs/pull/2032))
+
+## 3.6.0.pre.2 (2024-09-18)
+
+### Signature updates
+
+* `Kernel#class` ([#2017](https://github.com/ruby/rbs/pull/2017))
+* `TracePoint#enable` ([#2015](https://github.com/ruby/rbs/pull/2015))
+
+### Miscellaneous
+
+* Fix type definition and type errors ([#2016](https://github.com/ruby/rbs/pull/2016))
+
+## 3.6.0.pre.1 (2024-09-17)
+
+### Signature updates
+
+* csv ([#2012](https://github.com/ruby/rbs/pull/2012), [#1864](https://github.com/ruby/rbs/pull/1864), [#2002](https://github.com/ruby/rbs/pull/2002), [#2003](https://github.com/ruby/rbs/pull/2003), [#1903](https://github.com/ruby/rbs/pull/1903))
+* digest ([#1880](https://github.com/ruby/rbs/pull/1880))
+* kconv ([#1857](https://github.com/ruby/rbs/pull/1857))
+* zlib ([#1911](https://github.com/ruby/rbs/pull/1911))
+* `_Each` ([#2006](https://github.com/ruby/rbs/pull/2006))
+* `Array` ([#1921](https://github.com/ruby/rbs/pull/1921))
+* `Enumerable` ([#1921](https://github.com/ruby/rbs/pull/1921))
+* `Enumerator::_Each` ([#2006](https://github.com/ruby/rbs/pull/2006), [#1915](https://github.com/ruby/rbs/pull/1915))
+* `Enumerator` ([#2004](https://github.com/ruby/rbs/pull/2004))
+* `Kernel` ([#1945](https://github.com/ruby/rbs/pull/1945))
+* `Method` ([#1939](https://github.com/ruby/rbs/pull/1939))
+* `Module` ([#1921](https://github.com/ruby/rbs/pull/1921))
+* `Net::HTTPHeader` ([#1932](https://github.com/ruby/rbs/pull/1932))
+* `Proc` ([#1937](https://github.com/ruby/rbs/pull/1937))
+* `Queue` ([#2004](https://github.com/ruby/rbs/pull/2004))
+* `Range` ([#1921](https://github.com/ruby/rbs/pull/1921))
+* `Refinement` ([#1931](https://github.com/ruby/rbs/pull/1931))
+* `Symbol` ([#1930](https://github.com/ruby/rbs/pull/1930))
+* `TracePoint` ([#1943](https://github.com/ruby/rbs/pull/1943))
+* `#rand` ([#2007](https://github.com/ruby/rbs/pull/2007))
+* Use untyped blocks ([#1935](https://github.com/ruby/rbs/pull/1935))
+* Update docs for ruby-3.3.4 ([#1923](https://github.com/ruby/rbs/pull/1923))
+* Update docs for ruby-3.3.3 ([#1889](https://github.com/ruby/rbs/pull/1889))
+
+### Language updates
+
+* Fix position for default_type ([#1997](https://github.com/ruby/rbs/pull/1997))
+* Update `syntax.md` ([#1995](https://github.com/ruby/rbs/pull/1995))
+* Improve generics ([#1994](https://github.com/ruby/rbs/pull/1994))
+* Allow alias to module-self-type from module ([#1948](https://github.com/ruby/rbs/pull/1948))
+* Make it a syntax error when the keys of keyword and record are duplicated. ([#1883](https://github.com/ruby/rbs/pull/1883))
+
+### Library changes
+
+* Omit unnecessary field from location range ([#1788](https://github.com/ruby/rbs/pull/1788))
+* Handle ISEQs compiled by Prism ([#1983](https://github.com/ruby/rbs/pull/1983))
+* Add AST Visitor ([#1975](https://github.com/ruby/rbs/pull/1975))
+* Make the extension `GC.auto_compact` compatible ([#1971](https://github.com/ruby/rbs/pull/1971))
+* Make `FileFinder` faster by globbing all possible files ([#1965](https://github.com/ruby/rbs/pull/1965))
+* Fix #1905: Fix typo in `UntypedFunction` ([#1906](https://github.com/ruby/rbs/pull/1906))
+
+#### rbs prototype
+
+* [prototype] Remove redundant access modifier ([#1914](https://github.com/ruby/rbs/pull/1914))
+
+### Miscellaneous
+
+* Allow RBS/Style/InitializeReturnType ([#2008](https://github.com/ruby/rbs/pull/2008))
+* docs: An interface can include interfaces only and not modules ([#1996](https://github.com/ruby/rbs/pull/1996))
+* Fix the portability of an external command ([#2001](https://github.com/ruby/rbs/pull/2001))
+* Skip `AbstractSyntaxTree` test with ruby-3.4 ([#2005](https://github.com/ruby/rbs/pull/2005))
+* Fix test ([#1972](https://github.com/ruby/rbs/pull/1972))
+* Use `File.open` instead of `IO.sysopen` ([#1912](https://github.com/ruby/rbs/pull/1912))
+
+## 3.5.3 (2024-08-23)
+
+### Library changes
+
+* Backport GC fix PR ([#1977](https://github.com/ruby/rbs/pull/1977))
+
+## 3.5.2 (2024-07-10)
+
+### Library changes
+
+* Update docs for ruby-3.3.4 ([#1923](https://github.com/ruby/rbs/pull/1923), Backported in [#1925](https://github.com/ruby/rbs/pull/1925))
+* Update docs for ruby-3.3.3 ([#1889](https://github.com/ruby/rbs/pull/1889), Backported in [#1925](https://github.com/ruby/rbs/pull/1925))
+* Fix #1905: Fix typo in `UntypedFunction` ([#1906](https://github.com/ruby/rbs/pull/1906), Backported in [#1925](https://github.com/ruby/rbs/pull/1925))
+
+### Miscellaneous
+
+* Use `File.open` instead of `IO.sysopen` ([#1913](https://github.com/ruby/rbs/pull/1913))
+
 ## 3.5.1 (2024-06-07)
 
 ### Library changes

data/Rakefile

@@ -56,7 +56,7 @@ end
 task :validate => :compile do
   require 'yaml'
 
-  sh "#{ruby} #{rbs} validate"
+  sh "#{ruby} #{rbs} validate --exit-error-on-syntax-error"
 
   libs = FileList["stdlib/*"].map {|path| File.basename(path).to_s }
 
@@ -72,7 +72,7 @@ task :validate => :compile do
   end
 
   libs.each do |lib|
-    sh "#{ruby} #{rbs} -r #{lib} validate"
+    sh "#{ruby} #{rbs} -r #{lib} validate --exit-error-on-syntax-error"
   end
 end
 
@@ -106,11 +106,17 @@ task :typecheck_test => :compile do
 end
 
 task :raap => :compile do
-  sh %q[cat test/raap.txt | egrep -v '^#|^$' | xargs bundle exec raap]
+  sh %q[ruby test/raap.rb | xargs bundle exec raap -r digest/bubblebabble --library digest --allow-private]
 end
 
 task :rubocop do
-  sh "rubocop --parallel"
+  format = if ENV["CI"]
+    "github"
+  else
+    "progress"
+  end
+
+  sh "rubocop --parallel --format #{format}"
 end
 
 namespace :generate do

data/core/array.rbs

@@ -600,8 +600,6 @@ class Array[unchecked out Elem] < Object
   #
   def self.try_convert: [U] (untyped) -> ::Array[U]?
 
-  public
-
   # <!--
   #   rdoc-file=array.c
   #   - array & other_array -> new_array
@@ -1082,7 +1080,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 +1376,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 +1940,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 +2239,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 +2319,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 +3116,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 +3195,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 +3321,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 +3391,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]?
 

data/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
@@ -256,7 +256,7 @@ class BasicObject
   # -->
   # Returns a new BasicObject.
   #
-  def initialize: () -> nil
+  def initialize: () -> void
 
   private
 
@@ -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

data/core/builtin.rbs

@@ -170,12 +170,12 @@ interface _Inspect
   def inspect: () -> String
 end
 
-interface _Each[out A]
-  def each: () { (A) -> void } -> void
+interface _Each[out E, out R = void]
+  def each: () { (E) -> void } -> R
 end
 
-interface _EachEntry[out A]
-  def each_entry: () { (A) -> void } -> self
+interface _EachEntry[out E]
+  def each_entry: () { (E) -> void } -> self
 end
 
 interface _Reader

data/core/complex.rbs

@@ -109,8 +109,6 @@ class Complex < Numeric
   #
   alias self.rectangular self.rect
 
-  public
-
   # <!--
   #   rdoc-file=complex.c
   #   - complex * numeric -> new_complex

data/core/data.rbs

@@ -183,8 +183,6 @@ class Data
 
   def self.allocate: () -> bot
 
-  public
-
   # <!--
   #   rdoc-file=struct.c
   #   - self == other -> true or false

data/core/dir.rbs

@@ -182,7 +182,7 @@ class Dir
   #     Dir.new('.').read.encoding                       # => #<Encoding:UTF-8>
   #     Dir.new('.', encoding: 'US-ASCII').read.encoding # => #<Encoding:US-ASCII>
   #
-  def initialize: (path dir, ?encoding: encoding?) -> self
+  def initialize: (path dir, ?encoding: encoding?) -> void
 
   # <!--
   #   rdoc-file=dir.rb
@@ -759,8 +759,6 @@ class Dir
   #
   alias self.unlink self.delete
 
-  public
-
   # <!--
   #   rdoc-file=dir.c
   #   - chdir -> 0

data/core/encoding.rbs

@@ -780,8 +780,6 @@ class Encoding::Converter < Object
                               ?xml: :text | :attr
                             ) -> conversion_path
 
-  public
-
   # <!--
   #   rdoc-file=transcode.c
   #   - ec == other        -> true or false

data/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

data/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
@@ -44,8 +44,6 @@ class Enumerator[unchecked out Elem, out Return]
     #
     def initialize: (*_EachEntry[Elem]) -> void
 
-    public
-
     # <!--
     #   rdoc-file=enumerator.c
     #   - obj.each { |...| ... } -> obj

data/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.
   #