rbs 3.6.0.dev.1 → 3.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c653ea578000329720980ce7845237e8c49c9319a72c5a4f5bc315306cde02
-  data.tar.gz: e9ccad52c36cd4ef0509ce78ab0d857810b80ed6489d8b6b1fcdac0af47f5e59
+  metadata.gz: 6884f033b29e9db43f782ee20e91a89d329fa51271d015fe0d25d4f4c1dd8166
+  data.tar.gz: 11db8e1f37cae5204b74d126c80e7b6b75990a33dec81f00519967a517cdf17e
 SHA512:
-  metadata.gz: c2468b174c0800686e77f26122898d84e2f2506b5b91074d30d18766ce60992257bd560843972ddf72c77e9b8bda26dfb58f012893dbae1585f994fecd480a7b
-  data.tar.gz: 9c534d38496760cc1ad91f8776e83e61672305c564c6b14fc206fd202817a5be2d60d675558dfbe6b9fadbf9f980c595c2432c821cae38a5b447857d5601ab5e
+  metadata.gz: 9193fb829e1503c2179cc802c20b37bd1b8ed25417bf032a642da25689e0709a753525f5bf2424c57caf4bc57aeb9a5cf03c0062b11e2d36632b1e8b6ae77c31
+  data.tar.gz: 13a766ee6f81f3ad426af8e6de51289fea8d656b848d038afc15fc21eda0fabc3f525e5035df02b09948113ae0f8ada0965ede862cd17efb52a72ce42631862a

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,81 @@
 # CHANGELOG
 
+## 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

@@ -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/basic_object.rbs

@@ -256,7 +256,7 @@ class BasicObject
   # -->
   # Returns a new BasicObject.
   #
-  def initialize: () -> nil
+  def initialize: () -> void
 
   private
 

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

data/core/enumerable.rbs

@@ -529,7 +529,7 @@ 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]
+              | () ?{ () -> Integer } -> Enumerator[Elem, self]
 
   %a{annotate:rdoc:skip}
   alias to_enum enum_for
@@ -1299,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
@@ -1760,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
@@ -1846,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
@@ -2092,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
@@ -2142,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
@@ -2204,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
@@ -2239,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
@@ -2396,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

data/core/enumerator.rbs

@@ -127,12 +127,12 @@
 #     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]
+  interface _Each[out E, out R = self]
     def each: () { (E) -> void } -> R
             | () -> Enumerator[E, R]
   end
@@ -567,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.
   #

data/core/errors.rbs

@@ -597,7 +597,7 @@ class SystemCallError < StandardError
   # SystemCallError object. The error number is subsequently available via the
   # #errno method.
   #
-  def initialize: (string msg, Integer errno) -> SystemCallError
+  def initialize: (string msg, Integer errno) -> void
 
   # <!--
   #   rdoc-file=error.c

data/core/exception.rbs

@@ -250,7 +250,7 @@ class Exception
   # -->
   # Construct a new Exception object, optionally passing in a message.
   #
-  def initialize: (?string | _ToS message) -> self
+  def initialize: (?string | _ToS message) -> void
 
   # <!--
   #   rdoc-file=error.c

data/core/file.rbs

@@ -875,7 +875,7 @@ class File < IO
   # *   [Open Options](rdoc-ref:IO@Open+Options).
   # *   [Encoding options](rdoc-ref:encodings.rdoc@Encoding+Options).
   #
-  def initialize: (string | _ToPath | int file_name, ?string | int mode, ?int perm) -> File
+  def initialize: (string | _ToPath | int file_name, ?string | int mode, ?int perm) -> void
 
   # <!--
   #   rdoc-file=file.c

data/core/integer.rbs

@@ -1168,10 +1168,10 @@ class Integer < Numeric
           | (to: Numeric, ?by: Integer) { (Integer) -> void } -> void
           | (by: Numeric, ?to: Numeric) { (Numeric) -> void } -> void
           | () -> Enumerator[Integer, bot]
-          | (Numeric limit, ?Integer step) -> Enumerator[Integer, void]
-          | (Numeric limit, ?Numeric step) -> Enumerator[Numeric, void]
-          | (to: Numeric, ?by: Integer) -> Enumerator[Integer, void]
-          | (by: Numeric, ?to: Numeric) -> Enumerator[Numeric, void]
+          | (Numeric limit, ?Integer step) -> Enumerator[Integer]
+          | (Numeric limit, ?Numeric step) -> Enumerator[Numeric]
+          | (to: Numeric, ?by: Integer) -> Enumerator[Integer]
+          | (by: Numeric, ?to: Numeric) -> Enumerator[Numeric]
 
   # <!--
   #   rdoc-file=numeric.c

data/core/kernel.rbs

@@ -675,7 +675,7 @@ module Kernel : BasicObject
                     | (int | _ToR rational_like, exception: bool) -> Rational?
                     | (int | _ToR numer, ?int | _ToR denom, ?exception: true) -> Rational
                     | (int | _ToR numer, ?int | _ToR denom, exception: bool) -> Rational?
-                    | [T] (Numeric&_RationalDiv[T] numer, Numeric denom, ?exception: bool) -> T
+                    | [T] (Numeric & _RationalDiv[T] numer, Numeric denom, ?exception: bool) -> T
                     | [T < Numeric] (T value, 1, ?exception: bool) -> T
                     | (untyped, ?untyped, ?exception: bool) -> Rational?
 
@@ -1319,7 +1319,7 @@ module Kernel : BasicObject
   # See also Random.rand.
   #
   def self?.rand: (?0) -> Float
-                | (int arg0) -> (Integer | Float)
+                | (int arg0) -> Integer
                 | (::Range[Integer] arg0) -> Integer?
                 | (::Range[Float] arg0) -> Float?
 

data/core/module.rbs

@@ -904,7 +904,7 @@ class Module < Object
   # Assign the module to a constant (name starting uppercase) if you want to treat
   # it like a regular module.
   #
-  def initialize: () -> Object
+  def initialize: () -> void
                 | () { (Module arg0) -> untyped } -> void
 
   # <!--

data/core/random.rbs

@@ -91,7 +91,7 @@ class Random < RBS::Unnamed::Random_Base
   #
   # See also Random#rand.
   #
-  def self.rand: () -> Float
+  def self.rand: (?0) -> Float
                | (Integer | ::Range[Integer] max) -> Integer
                | (Float | ::Range[Float] max) -> Float
                | [T < Numeric] (::Range[T]) -> T

data/core/rbs/unnamed/env_class.rbs

@@ -231,8 +231,8 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.fetch}
       def fetch: (String name) -> String
-              | [X] (String name, X default) -> (String | X)
-              | [X] (String name) { (String) -> X } -> (String | X)
+               | [X] (String name, X default) -> (String | X)
+               | [X] (String name) { (String) -> X } -> (String | X)
 
       # <!--
       #   rdoc-file=hash.c
@@ -382,7 +382,7 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.each_pair}
       def each_pair: () -> ::Enumerator[[ String, String ], self]
-                  | () { ([ String, String ]) -> void } -> self
+                   | () { ([ String, String ]) -> void } -> self
 
       # <!--
       #   rdoc-file=hash.c
@@ -479,7 +479,7 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.delete_if}
       def delete_if: () -> ::Enumerator[[ String, String ], self]
-                  | () { (String name, String value) -> boolish } -> self
+                   | () { (String name, String value) -> boolish } -> self
 
       # <!--
       #   rdoc-file=hash.c
@@ -501,7 +501,7 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.keep_if}
       def keep_if: () -> ::Enumerator[[ String, String ], self]
-                | () { (String name, String value) -> boolish } -> self
+                 | () { (String name, String value) -> boolish } -> self
 
       # <!--
       #   rdoc-file=hash.c
@@ -588,7 +588,7 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.reject!}
       def reject!: () -> ::Enumerator[[ String, String ], self?]
-                | () { (String name, String value) -> boolish } -> self?
+                 | () { (String name, String value) -> boolish } -> self?
 
       # <!--
       #   rdoc-file=hash.c
@@ -674,7 +674,7 @@ module RBS
       #
       %a{annotate:rdoc:copy:ENV.select!}
       def select!: () -> ::Enumerator[[ String, String ], self?]
-                | () { (String name, String value) -> boolish } -> self?
+                 | () { (String name, String value) -> boolish } -> self?
 
       # <!--
       #   rdoc-file=hash.c

data/core/rbs/unnamed/random.rbs

@@ -47,7 +47,7 @@ module RBS
       # (`-`) and add (`+`)methods, or rand will raise an ArgumentError.
       #
       %a{annotate:rdoc:copy:Random#rand}
-      def rand: () -> Float
+      def rand: (?0) -> Float
               | (Integer | ::Range[Integer] max) -> Integer
               | (Float | ::Range[Float] max) -> Float
 
@@ -200,13 +200,13 @@ module RBS
       # Generates formatted random number from raw random bytes. See Random#rand.
       #
       %a{annotate:rdoc:copy:Random::Formatter#rand}
-      def rand: () -> Float
-              | (?Float? n) -> Float
-              | (?Integer? n) -> Integer
-              | (?Numeric? n) -> Numeric
-              | (?::Range[Float]? n) -> Float
-              | (?::Range[Integer]? n) -> Integer
-              | (?::Range[Numeric]? n) -> Numeric
+      def rand: (?0) -> Float
+              | (Float? n) -> Float
+              | (Integer n) -> Integer
+              | (Numeric n) -> Numeric
+              | (::Range[Float] n) -> Float
+              | (::Range[Integer] n) -> Integer
+              | (::Range[Numeric] n) -> Numeric
 
       %a{annotate:rdoc:copy:Random::Formatter#random_byte}
       def random_bytes: (?Integer? n) -> String
@@ -224,12 +224,12 @@ module RBS
       #
       %a{annotate:rdoc:copy:Random::Formatter#random_number}
       def random_number: () -> Float
-                      | (?Float? n) -> Float
-                      | (?Integer? n) -> Integer
-                      | (?Numeric? n) -> Numeric
-                      | (?::Range[Float]? n) -> Float
-                      | (?::Range[Integer]? n) -> Integer
-                      | (?::Range[Numeric]? n) -> Numeric
+                       | (?Float? n) -> Float
+                       | (?Integer? n) -> Integer
+                       | (?Numeric? n) -> Numeric
+                       | (?::Range[Float]? n) -> Float
+                       | (?::Range[Integer]? n) -> Integer
+                       | (?::Range[Numeric]? n) -> Numeric
 
       # <!--
       #   rdoc-file=lib/random/formatter.rb

data/core/regexp.rbs

@@ -1596,8 +1596,8 @@ class Regexp
   #     r3 = Regexp.new(r, timeout: 3.14)            # => /foo/m
   #     r3.timeout                                   # => 3.14
   #
-  def initialize: (Regexp regexp, ?timeout: _ToF?) -> self
-                | (string pattern, ?int | string | bool | nil options, ?timeout: _ToF?) -> self
+  def initialize: (Regexp regexp, ?timeout: _ToF?) -> void
+                | (string pattern, ?int | string | bool | nil options, ?timeout: _ToF?) -> void
 
   def initialize_copy: (self object) -> self
 

data/core/thread.rbs

@@ -1545,7 +1545,7 @@ end
 #
 #     consumer.join
 #
-class Thread::Queue < Object
+class Thread::Queue[Elem = untyped] < Object
   # <!-- rdoc-file=thread_sync.c -->
   # Pushes the given `object` to the queue.
   #
@@ -1661,7 +1661,7 @@ class Thread::Queue < Object
   # If `timeout` seconds have passed and no data is available `nil` is returned.
   # If `timeout` is `0` it returns immediately.
   #
-  def pop: (?boolish non_block, ?timeout: _ToF?) -> untyped
+  def pop: (?boolish non_block, ?timeout: _ToF?) -> Elem?
 
   # <!--
   #   rdoc-file=thread_sync.c
@@ -1671,7 +1671,7 @@ class Thread::Queue < Object
   # -->
   # Pushes the given `object` to the queue.
   #
-  def push: (untyped obj) -> void
+  def push: (Elem obj) -> void
 
   # <!--
   #   rdoc-file=thread_sync.rb
@@ -1692,7 +1692,7 @@ end
 #
 # See Thread::Queue for an example of how a Thread::SizedQueue works.
 #
-class Thread::SizedQueue < Thread::Queue
+class Thread::SizedQueue[Elem = untyped] < Thread::Queue[Elem]
   # <!--
   #   rdoc-file=thread_sync.rb
   #   - <<(object, non_block = false, timeout: nil)
@@ -1755,7 +1755,8 @@ class Thread::SizedQueue < Thread::Queue
   # If `timeout` seconds have passed and no space is available `nil` is returned.
   # If `timeout` is `0` it returns immediately. Otherwise it returns `self`.
   #
-  def push: (untyped obj, ?boolish non_block, timeout: _ToF?) -> void
+  def push: (Elem obj, ?boolish non_block) -> void
+          | (Elem obj, timeout: _ToF?) -> self?
 end
 
 class ConditionVariable = Thread::ConditionVariable

data/docs/syntax.md

@@ -424,8 +424,10 @@ _visibility_ ::= `public` | `private`
 
 _attribute-type_ ::= `attr_reader` | `attr_writer` | `attr_accessor`
 
-_include-member_ ::= `include` _class-name_ _type-arguments_
-                   | `include` _interface-name_ _type-arguments_
+_include-member_ ::= _include-class-member_
+                   | _include-interface-member_
+_include-class-member_ ::= `include` _class-name_ _type-arguments_
+_include-interface-member_ :== `include` _interface-name_ _type-arguments_
 _extend-member_ ::= `extend` _class-name_ _type-arguments_
                   | `extend` _interface-name_ _type-arguments_
 _prepend-member_ ::= `prepend` _class-name_ _type-arguments_
@@ -621,7 +623,7 @@ _module-self-types_ ::= _class-name_ _type-arguments_ `,` _module-self-types_
 _interface-decl_ ::= `interface` _interface-name_ _module-type-parameters_ _interface-members_ `end`
 
 _interface-members_ ::= _method-member_              # Method
-                      | _include-member_             # Mixin (include)
+                      | _include-interface-member_   # Mixin (include)
                       | _alias-member_               # Alias
 
 _type-alias-decl_ ::= `type` _alias-name_ _module-type-parameters_ `=` _type_

data/ext/rbs_extension/lexer.c

@@ -116,7 +116,7 @@ token rbsparser_next_token(lexstate *state) {
 yy1:
 	rbs_skip(state);
 #line 144 "ext/rbs_extension/lexer.re"
-	{ return next_token(state, pEOF); }
+	{ return next_eof_token(state); }
 #line 121 "ext/rbs_extension/lexer.c"
 yy2:
 	rbs_skip(state);

data/ext/rbs_extension/lexer.h

@@ -167,6 +167,11 @@ void skipn(lexstate *state, size_t size);
  * */
 token next_token(lexstate *state, enum TokenType type);
 
+/**
+ * Return new token with EOF type.
+ * */
+token next_eof_token(lexstate *state);
+
 token rbsparser_next_token(lexstate *state);
 
 void print_token(token tok);

data/ext/rbs_extension/lexer.re

@@ -141,7 +141,7 @@ token rbsparser_next_token(lexstate *state) {
       skip = ([ \t]+|[\r\n]);
 
       skip     { return next_token(state, tTRIVIA); }
-      "\x00"   { return next_token(state, pEOF); }
+      "\x00"   { return next_eof_token(state); }
       *        { return next_token(state, ErrorToken); }
   */
 }

data/ext/rbs_extension/lexstate.c

@@ -129,6 +129,22 @@ token next_token(lexstate *state, enum TokenType type) {
   return t;
 }
 
+token next_eof_token(lexstate *state) {
+  if (state->current.byte_pos == RSTRING_LEN(state->string)+1) {
+    // End of String
+    token t;
+    t.type = pEOF;
+    t.range.start = state->start;
+    t.range.end = state->start;
+    state->start = state->current;
+
+    return t;
+  } else {
+    // NULL byte in the middle of the string
+    return next_token(state, pEOF);
+  }
+}
+
 void rbs_skip(lexstate *state) {
   if (!state->last_char) {
     peek(state);