rbs 3.8.1 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a48774543c23555bbcb9c6a13b387db3069fe4c65d534a7915798e85d37fa770
-  data.tar.gz: 034e53e2be22a3ca9ac15b8f95585c8fe42bf2267268f1eb23cffe2e92098213
+  metadata.gz: 170d86a49dcb384a18b08feffedd7ff3edef07ff08305c566f84f613765af36d
+  data.tar.gz: '09975862bee26d90936c89c7d461c992829665b866053551ff02bd7a679ebd26'
 SHA512:
-  metadata.gz: 31c29db0f7d38c22d3ab9c3ee5df5403bba9b489b38211fdd824b76f948e89efafd4b2e3afe81ec9420b3a76c350daccb5b23dddd57d85199a93531fd28e73b3
-  data.tar.gz: d8077101a4f4f26073d047ad4c7b04752f7e1849a1b3bdcfc41703e82b6b109d68e8c295ed2a0af57fc5e5744600ad89b77f24b1b93fbee226b42bd5d86493ee
+  metadata.gz: 653e269661b10cce36470bf51163e2ecb056bd9a1714de6c9a6aeb2d3d659b95a73460737b74328fd594cdf6455ee3a90308d63898a447ddc99d8e36b10b9733
+  data.tar.gz: 27fe334fe021669723ad96918d6c01543cfe93b64217229668b7a77182df3c4fde89f4c98bb55577b0b12dc04658bfb735a3813f5d56c0f6b951fe6a8d993edb

data/.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
     steps:
       - name: Dependabot metadata
-        uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
+        uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
         id: metadata
       - name: Checkout repository
         uses: actions/checkout@v4

data/.github/workflows/ruby.yml

@@ -80,3 +80,29 @@ jobs:
       - name: Run test
         run: |
           bundle exec rake ${{ matrix.job }}
+  valgrind:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: 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
+          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool python3 valgrind
+      - name: Update rubygems & bundler
+        run: |
+          ruby -v
+          gem update --system
+      - name: bin/setup
+        run: |
+          bin/setup
+      - run: bundle exec rake test:valgrind
+        env:
+          RUBY_FREE_AT_EXIT: 1

data/.github/workflows/typecheck.yml

@@ -20,6 +20,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

data/.github/workflows/windows.yml

@@ -20,6 +20,21 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+
+      # ucrt and mswin have the dev version Ruby.
+      # It introduce checksum mismatches for bundled gems. So remove them before `bundle install`
+      - name: Purge gem caches
+        run: |
+          ruby -e '
+            exit if "${{ matrix.ruby }}" != "ucrt" && "${{ matrix.ruby }}" != "mswin"
+
+            require "open-uri"
+            require "json"
+
+            res = URI.parse("https://stdgems.org/bundled_gems.json").read
+            bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
+            system "gem uninstall --force #{bundled_gems.join(" ")}", exception: true
+          '
       - name: bundle install
         run: |
           bundle config set without profilers libs

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-on-rbs
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   DisabledByDefault: true
   Exclude:
     - 'vendor/bundle/**/*'
@@ -44,10 +44,22 @@ RBS/Style:
   Exclude:
     - 'sig/**/*'
     - 'test/**/*'
+RBS/Style/BlockReturnBoolish:
+  Enabled: true
+RBS/Style/ClassWithSingleton:
+  Enabled: true
+RBS/Style/DuplicatedType:
+  Enabled: true
 RBS/Style/EmptyArgument:
   Enabled: true
 RBS/Style/InitializeReturnType:
   Enabled: true
+RBS/Style/InstanceWithInstance:
+  Enabled: true
+RBS/Style/OptionalNil:
+  Enabled: true
+RBS/Style/RedundantParentheses:
+  Enabled: true
 
 Lint/DuplicateMethods:
   Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,85 @@
 # CHANGELOG
 
+## 3.9.2 (2025-03-31)
+
+### Library changes
+
+* Change `{}` to `{ 0 }` ([#2354](https://github.com/ruby/rbs/pull/2354))
+
+## 3.9.1 (2025-03-24)
+
+### Miscellaneous
+
+* `did_you_mean` is a default gem ([#2348](https://github.com/ruby/rbs/pull/2348))
+* Skip loading ruby_memcheck ([#2347](https://github.com/ruby/rbs/pull/2347))
+
+## 3.9.0 (2025-03-18)
+
+### Miscellaneous
+
+* Update steep ([#2328](https://github.com/ruby/rbs/pull/2328))
+
+## 3.9.0.pre.2 (2025-03-14)
+
+### Signature updates
+
+* `Hash.new` type ([#2323](https://github.com/ruby/rbs/pull/2323))
+* `Module#define_method` ([#2325](https://github.com/ruby/rbs/pull/2325))
+* `Object#define_singleton_method` ([#2324](https://github.com/ruby/rbs/pull/2324))
+
+### Language updates
+
+* Fix `define_method` method block self type ([#2325](https://github.com/ruby/rbs/pull/2325))
+
+## 3.9.0.pre.1 (2025-03-11)
+
+### Signature updates
+
+* `CGI.escape/unescape_uri_component` ([#2299](https://github.com/ruby/rbs/pull/2299))
+* `Enumerator::Chain` ([#2220](https://github.com/ruby/rbs/pull/2220))
+* `IO.read` ([#2216](https://github.com/ruby/rbs/pull/2216))
+* `IPAddr#netmask` ([#2311](https://github.com/ruby/rbs/pull/2311))
+* `Kernel#gets`, `Kernel#readline`, `Kernel#readlines` ([#2212](https://github.com/ruby/rbs/pull/2212))
+* `Net::HTTP.start` ([#2225](https://github.com/ruby/rbs/pull/2225))
+* `OpenSSL::BN` ([#2267](https://github.com/ruby/rbs/pull/2267))
+* `OpenSSL::PKey::{RSA,DSA,DH}#params` ([#2255](https://github.com/ruby/rbs/pull/2255))
+* `UNIXSocket#send_io`, `UNIXSocket#recv_io` ([#2264](https://github.com/ruby/rbs/pull/2264))
+* `URI.encode/decode_uri_component` ([#2299](https://github.com/ruby/rbs/pull/2299))
+* Rename to reduce top-level interface and type alias ([#2250](https://github.com/ruby/rbs/pull/2250))
+
+### Language updates
+
+* Let class/module alias decls, global decls, and constant decls be annotated ([#2302](https://github.com/ruby/rbs/pull/2302))
+* Add `resolve-type-names: false` magic comment ([#2234](https://github.com/ruby/rbs/pull/2234))
+
+### Library changes
+
+* Remove unused root variable ([#2307](https://github.com/ruby/rbs/pull/2307))
+* Run Valgrind on CI and fix memory leaks ([#2309](https://github.com/ruby/rbs/pull/2309))
+* Add information for VariableDuplicationError ([#2310](https://github.com/ruby/rbs/pull/2310))
+* Reduce Array object allocation during parsing ([#2304](https://github.com/ruby/rbs/pull/2304))
+* No class variable duplication validation ([#2305](https://github.com/ruby/rbs/pull/2305))
+* Keep annotations during type name resolution ([#2303](https://github.com/ruby/rbs/pull/2303))
+* Fix method annotations ([#2301](https://github.com/ruby/rbs/pull/2301))
+* Fix class variable ([#2300](https://github.com/ruby/rbs/pull/2300))
+* Add bundled gems to alumnus  ([#2288](https://github.com/ruby/rbs/pull/2288))
+* Exclude `attr_*` methods from duplicate checks. ([#2294](https://github.com/ruby/rbs/pull/2294))
+* Validate superclass and module-self-type ([#2289](https://github.com/ruby/rbs/pull/2289))
+* Remove case when `rubygems` and `set` ([#2279](https://github.com/ruby/rbs/pull/2279))
+* Check variable duplication ([#2241](https://github.com/ruby/rbs/pull/2241))
+* Validate variable types ([#2237](https://github.com/ruby/rbs/pull/2237))
+* Remove call to `TypeParam#unchecked!` from C parser ([#2256](https://github.com/ruby/rbs/pull/2256))
+* Remove call to `Any#todo!` from C parser ([#2249](https://github.com/ruby/rbs/pull/2249))
+* [rbs/unit_test] Treat nil as a return value ([#2257](https://github.com/ruby/rbs/pull/2257))
+
+### Miscellaneous
+
+* Apply rubocop style to RBS ([#2292](https://github.com/ruby/rbs/pull/2292))
+* Eliminate external HTTP requests on test ([#2253](https://github.com/ruby/rbs/pull/2253))
+* Prevent a warning: the block passed to 'map_type_name' .. may be ignored ([#2248](https://github.com/ruby/rbs/pull/2248))
+* Update ruby version for rubocop ([#2251](https://github.com/ruby/rbs/pull/2251))
+* Drop templates from package ([#2214](https://github.com/ruby/rbs/pull/2214))
+
 ## 3.8.1 (2024-12-27)
 
 ### Signature updates

data/Rakefile

@@ -11,7 +11,7 @@ bin = File.join(__dir__, "bin")
 
 Rake::ExtensionTask.new("rbs_extension")
 
-Rake::TestTask.new(:test => :compile) do |t|
+test_config = lambda do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"].reject do |path|
@@ -19,6 +19,20 @@ Rake::TestTask.new(:test => :compile) do |t|
   end
 end
 
+Rake::TestTask.new(test: :compile, &test_config)
+
+unless Gem.win_platform?
+  begin
+    require "ruby_memcheck"
+
+    namespace :test do
+      RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
+    end
+  rescue LoadError => exn
+    STDERR.puts "🚨🚨🚨🚨 Skipping RubyMemcheck: #{exn.inspect} 🚨🚨🚨🚨"
+  end
+end
+
 multitask :default => [:test, :stdlib_test, :typecheck_test, :rubocop, :validate, :test_doc]
 
 task :lexer do
@@ -112,7 +126,7 @@ end
 
 task :stdlib_test => :compile do
   test_files = FileList["test/stdlib/**/*_test.rb"].reject do |path|
-    path =~ %r{Ractor} || path =~ %r{Encoding}
+    path =~ %r{Ractor} || path =~ %r{Encoding} || path =~ %r{CGI_test}
   end
 
   if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
@@ -121,6 +135,7 @@ task :stdlib_test => :compile do
 
   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/CGI_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Encoding_test.rb"
 end
@@ -139,7 +154,9 @@ task :typecheck_test => :compile do
 end
 
 task :raap => :compile do
-  sh %q[ruby test/raap.rb | xargs bundle exec raap -r digest/bubblebabble --library digest --allow-private]
+  sh "ruby test/raap/core.rb"
+  sh "ruby test/raap/digest.rb"
+  sh "ruby test/raap/openssl.rb"
 end
 
 task :rubocop do

data/config.yml

@@ -27,18 +27,21 @@ nodes:
       - name: old_name
       - name: location
       - name: comment
+      - name: annotations
   - name: RBS::AST::Declarations::Constant
     fields:
       - name: name
       - name: type
       - name: location
       - name: comment
+      - name: annotations
   - name: RBS::AST::Declarations::Global
     fields:
       - name: name
       - name: type
       - name: location
       - name: comment
+      - name: annotations
   - name: RBS::AST::Declarations::Interface
     fields:
       - name: name
@@ -67,6 +70,7 @@ nodes:
       - name: old_name
       - name: location
       - name: comment
+      - name: annotations
   - name: RBS::AST::Declarations::TypeAlias
     fields:
       - name: name
@@ -191,6 +195,7 @@ nodes:
       - name: variance
       - name: upper_bound
       - name: default_type
+      - name: unchecked
       - name: location
   - name: RBS::MethodType
     fields:
@@ -213,6 +218,7 @@ nodes:
       - name: location
   - name: RBS::Types::Bases::Any
     fields:
+      - name: todo
       - name: location
   - name: RBS::Types::Bases::Bool
     fields:

data/core/data.rbs

@@ -411,5 +411,5 @@ class Data
   #     out = origin.with(z: 1) # ArgumentError: unknown keyword: :z
   #     some_point = origin.with(1, 2) # ArgumentError: expected keyword arguments, got positional arguments
   #
-  def with: (**untyped) -> instance
+  def with: (**untyped) -> self
 end

data/core/enumerator.rbs

@@ -613,7 +613,18 @@ end
 # This type of objects can be created by Enumerable#chain and Enumerator#+.
 #
 class Enumerator::Chain[out Elem] < Enumerator[Elem, void]
-  include Enumerable[Elem]
+  # <!--
+  #   rdoc-file=enumerator.c
+  #   - Enumerator::Chain.new(*enums) -> enum
+  # -->
+  # Generates a new enumerator object that iterates over the elements of given
+  # enumerable objects in sequence.
+  #
+  #     e = Enumerator::Chain.new(1..3, [4, 5])
+  #     e.to_a #=> [1, 2, 3, 4, 5]
+  #     e.size #=> 5
+  #
+  def initialize: (*_Each[Elem] enums) -> void
 
   # <!--
   #   rdoc-file=enumerator.c
@@ -626,5 +637,6 @@ class Enumerator::Chain[out Elem] < Enumerator[Elem, void]
   #
   # If no block is given, returns an enumerator.
   #
-  def each: () { (Elem) -> void } -> void
+  def each: () { (Elem) -> void } -> self
+          | () -> Enumerator[Elem, self]
 end

data/core/exception.rbs

@@ -270,7 +270,7 @@ class Exception
   #     x0..equal?(x1)            # => false
   #
   def exception: (?self) -> self
-               | (string | _ToS message) -> instance
+               | (string | _ToS message) -> self
 
   # <!--
   #   rdoc-file=error.c

data/core/gc.rbs

@@ -111,7 +111,7 @@ module GC
     # `:HAVE_FINALIZE`
     # :
     #
-    def self.raw_data: () -> Array[Hash[Symbol, untyped]]
+    def self.raw_data: () -> Array[Hash[Symbol, untyped]]?
 
     # <!--
     #   rdoc-file=gc.c

data/core/hash.rbs

@@ -1845,8 +1845,8 @@ class Hash[unchecked out K, unchecked out V] < Object
   # be resized.
   #
   def initialize: (?capacity: int) -> void
-                | [V] (V default, ?capacity: int) -> void
-                | [A, B] (?capacity: int) { (Hash[A, B] hash, A key) -> B } -> void
+                | (V default, ?capacity: int) -> void
+                | (?capacity: int) { (Hash[K, V] hash, K key) -> V } -> void
 
   # <!--
   #   rdoc-file=hash.c

data/core/io.rbs

@@ -2278,7 +2278,7 @@ class IO < Object
   # potential security vulnerabilities if called with untrusted input; see
   # [Command Injection](rdoc-ref:command_injection.rdoc).
   #
-  def self.binread: (String name, ?Integer length, ?Integer offset) -> String
+  def self.binread: (String name, ?Integer? length, ?Integer offset) -> String
 
   # <!--
   #   rdoc-file=io.c
@@ -2343,7 +2343,7 @@ class IO < Object
   #     IO.copy_stream('t.txt', 't.tmp', 11, 11) # => 11
   #     IO.read('t.tmp')                         # => "Second line"
   #
-  def self.copy_stream: (String | _Reader | _ReaderPartial src, String | _Writer dst, ?Integer copy_length, ?Integer src_offset) -> Integer
+  def self.copy_stream: (String | _Reader | _ReaderPartial src, String | _Writer dst, ?Integer? copy_length, ?Integer src_offset) -> Integer
 
   # <!--
   #   rdoc-file=io.c
@@ -2716,7 +2716,7 @@ class IO < Object
   # *   [Open Options](rdoc-ref:IO@Open+Options).
   # *   [Encoding options](rdoc-ref:encodings.rdoc@Encoding+Options).
   #
-  def self.read: (String name, ?Integer length, ?Integer offset, ?external_encoding: String | Encoding | nil, ?internal_encoding: String | Encoding | nil, ?encoding: String | Encoding | nil, ?textmode: boolish, ?binmode: boolish, ?autoclose: boolish, ?mode: String) -> String
+  def self.read: (String name, ?Integer? length, ?Integer offset, ?external_encoding: String | Encoding | nil, ?internal_encoding: String | Encoding | nil, ?encoding: String | Encoding | nil, ?textmode: boolish, ?binmode: boolish, ?autoclose: boolish, ?mode: String) -> String
 
   # <!--
   #   rdoc-file=io.c
@@ -3251,6 +3251,10 @@ class IO < Object
   #     f.close
   #
   alias to_i fileno
+
+  interface _ForFd[RET]
+    def for_fd: (?) -> RET
+  end
 end
 
 IO::APPEND: Integer

data/core/kernel.rbs

@@ -1163,7 +1163,7 @@ module Kernel : BasicObject
   # The style of programming using `$_` as an implicit parameter is gradually
   # losing favor in the Ruby community.
   #
-  def self?.gets: (?String arg0, ?Integer arg1) -> String?
+  def self?.gets: (?String sep, ?Integer limit, ?chomp: boolish) -> String?
 
   # <!--
   #   rdoc-file=eval.c
@@ -1486,7 +1486,7 @@ module Kernel : BasicObject
   # Optional keyword argument `chomp` specifies whether line separators are to be
   # omitted.
   #
-  def self?.readline: (?String arg0, ?Integer arg1) -> String
+  def self?.readline: (?String arg0, ?Integer arg1, ?chomp: boolish) -> String
 
   # <!--
   #   rdoc-file=io.c
@@ -1729,7 +1729,7 @@ module Kernel : BasicObject
   def self?.sleep: (?nil) -> bot
                  | (Time::_Timeout duration) -> Integer
 
-  %a{steep:deprecated}
+  %a{deprecated}
   interface _Divmod
     def divmod: (Numeric) -> [ Numeric, Numeric ]
   end
@@ -2297,7 +2297,7 @@ module Kernel : BasicObject
   #     chris.greet("Hi") #=> "Hi, I'm Chris!"
   #
   def define_singleton_method: (interned name, Method | UnboundMethod | Proc method) -> Symbol
-                             | (interned name) { (?) -> untyped } -> Symbol
+                             | (interned name) { (?) [self: self] -> untyped } -> Symbol
 
   # <!--
   #   rdoc-file=io.c

data/core/method.rbs

@@ -54,7 +54,7 @@ class Method
   #
   def hash: () -> Integer
 
-  def dup: () -> instance
+  def dup: () -> self
 
   # <!--
   #   rdoc-file=proc.c
@@ -252,7 +252,7 @@ class Method
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c

data/core/module.rbs

@@ -731,8 +731,8 @@ class Module < Object
   #     I'm Dino!
   #     #<B:0x401b39e8>
   #
-  def define_method: (interned symbol, ^() [self: instance] -> untyped | Method | UnboundMethod method) -> Symbol
-                   | (interned symbol) { () [self: instance] -> untyped } -> Symbol
+  def define_method: (interned symbol, ^(?) [self: top] -> untyped | Method | UnboundMethod method) -> Symbol
+                   | (interned symbol) { (?) [self: top] -> untyped } -> Symbol
 
   # <!--
   #   rdoc-file=object.c
@@ -1164,7 +1164,7 @@ class Module < Object
   # -->
   # Returns the name of the module *mod*.  Returns `nil` for anonymous modules.
   #
-  def name: () -> String?
+  def name: %a{implicitly-returns-nil} () -> String
 
   # <!--
   #   rdoc-file=eval.c
@@ -1699,6 +1699,6 @@ class Module < Object
   def attr: (*interned arg0) -> Array[Symbol]
 
   # A previous incarnation of `interned` for backward-compatibility (see #1499)
-  %a{steep:deprecated}
+  %a{deprecated: Use `interned`}
   type id = interned
 end

data/core/object.rbs

@@ -106,5 +106,5 @@ class Object < BasicObject
 end
 
 # A previous incarnation of `interned` for backward-compatibility (see #1499)
-%a{steep:deprecated}
+%a{deprecated: Use `interned` instead}
 type Object::name = interned

data/core/proc.rbs

@@ -376,8 +376,8 @@ class Proc
   #
   def self.new: () { (?) -> untyped } -> instance
 
-  def clone: () -> instance
-  def dup: () -> instance
+  def clone: () -> self
+  def dup: () -> self
 
   # <!-- rdoc-file=proc.c -->
   # Invokes the block, setting the block's parameters to the values in *params*

data/core/rbs/unnamed/argf.rbs

@@ -639,7 +639,7 @@ module RBS
       # See IO.readlines for details about getline_args.
       #
       %a{annotate:rdoc:copy:ARGF#gets}
-      def gets: (?String sep, ?Integer limit) -> String?
+      def gets: (?String sep, ?Integer limit, ?chomp: boolish) -> String?
 
       # <!--
       #   rdoc-file=io.c
@@ -1024,7 +1024,7 @@ module RBS
       # An EOFError is raised at the end of the file.
       #
       %a{annotate:rdoc:copy:ARGF#readline}
-      def readline: (?String sep, ?Integer limit) -> String
+      def readline: (?String sep, ?Integer limit, ?chomp: boolish) -> String
 
       # <!--
       #   rdoc-file=io.c
@@ -1044,7 +1044,7 @@ module RBS
       # See `IO.readlines` for a full description of all options.
       #
       %a{annotate:rdoc:copy:ARGF#readlines}
-      def readlines: (?String sep, ?Integer limit) -> ::Array[String]
+      def readlines: (?String sep, ?Integer limit, ?chomp: boolish) -> ::Array[String]
 
       # <!--
       #   rdoc-file=io.c

data/core/rubygems/version.rbs

@@ -221,7 +221,7 @@ module Gem
     #
     # Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
     #
-    def bump: () -> instance
+    def bump: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb
@@ -274,7 +274,7 @@ module Gem
     # The release for this version (e.g. 1.2.0.a -> 1.2.0). Non-prerelease versions
     # return themselves.
     #
-    def release: () -> instance
+    def release: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb

data/core/string.rbs

@@ -1936,7 +1936,7 @@ class String
     ?crlf_newline: boolish,
     ?lf_newline: boolish,
     ?fallback: ^(String) -> string? | Method | _EncodeFallbackAref
-  ) -> instance
+  ) -> self
 
   interface _EncodeFallbackAref
     def []: (String) -> string?
@@ -3574,10 +3574,10 @@ class String
   def valid_encoding?: () -> bool
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 interface _ArefFromStringToString
   def []: (String) -> String
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 type String::encode_fallback = Hash[String, String] | Proc | Method | _ArefFromStringToString

data/core/unbound_method.rbs

@@ -100,7 +100,7 @@ class UnboundMethod
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c

data/docs/syntax.md

@@ -289,7 +289,9 @@ The following `class`/`instance` types are allowed.
 class Foo
   attr_reader parent: class
 
-  def foo: () -> instance
+  def foo: () -> instance # behaves like `self` in this context
+
+  def self?.bar: () -> instance # behaves like `class` for `def self.bar()` and `self` for `def bar()`
 
   @@foos: Array[instance]
 
@@ -405,9 +407,12 @@ _ivar-member_ ::= _ivar-name_ `:` _type_
                 | `self` `.` _ivar-name_ `:` _type_
                 | _cvar-name_ `:` _type_
 
-_method-member_ ::= _visibility_ `def` _method-name_ `:` _method-types_            # Instance method
-                  | _visibility_ `def self.` _method-name_ `:` _method-types_      # Singleton method
-                  | `def self?.` _method-name_ `:` _method-types_     # Singleton and instance method
+_method-member_ ::= _method-class-member_
+                  | _method-interface-member_
+_method-class-member_ ::= _visibility_ `def` _method-name_ `:` _method-types_            # Instance method
+                        | _visibility_ `def self.` _method-name_ `:` _method-types_      # Singleton method
+                        | `def self?.` _method-name_ `:` _method-types_                  # Singleton and instance method
+_method-interface-member_ ::= `def` _method-name_ `:` _method-types_                     # Instance method
 
 _method-types_ ::= _method-type-parameters_ _method-type_                       # Single method type
                  | _method-type-parameters_ _method-type_ `|` _method-types_    # Overloading types
@@ -624,7 +629,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
+_interface-members_ ::= _method-interface-member_    # Method
                       | _include-interface-member_   # Mixin (include)
                       | _alias-member_               # Alias
 

data/ext/rbs_extension/extconf.rb

@@ -4,10 +4,11 @@ $INCFLAGS << " -I$(top_srcdir)" if $extmk
 $INCFLAGS << " -I$(srcdir)/../../include"
 
 $VPATH << "$(srcdir)/../../src"
+$VPATH << "$(srcdir)/../../src/util"
 $VPATH << "$(srcdir)/ext/rbs_extension"
 
 root_dir = File.expand_path('../../../', __FILE__)
-$srcs = Dir.glob("#{root_dir}/src/*.c") +
+$srcs = Dir.glob("#{root_dir}/src/**/*.c") +
         Dir.glob("#{root_dir}/ext/rbs_extension/*.c")
 
 append_cflags ['-std=gnu99']