Merge branch 'master' into c-api

Author: st0012

.github/workflows/ruby.yml

@@ -83,7 +83,7 @@ jobs:
   valgrind:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"

.github/workflows/windows.yml

@@ -33,7 +33,7 @@ jobs:
 
             res = URI.parse("https://stdgems.org/bundled_gems.json").read
             bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
-            system "gem uninstall #{bundled_gems.join(" ")}", exception: true
+            system "gem uninstall #{bundled_gems.join(" ")} --force", exception: true
           '
       - name: bundle install
         run: |

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 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

Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rbs (3.9.0.pre.2)
+    rbs (4.0.0.dev)
       logger
+      prism (>= 1.3.0)
 
 PATH
   remote: test/assets/test-gem
@@ -27,16 +28,16 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
     benchmark (0.4.0)
     benchmark-ips (2.14.0)
     bigdecimal (3.1.9)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    csv (3.3.2)
+    csv (3.3.3)
     dbm (1.1.0)
-    diff-lcs (1.6.0)
+    diff-lcs (1.6.1)
     digest (3.2.0)
     drb (2.2.1)
     ffi (1.17.1)
@@ -57,7 +58,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.6)
+    logger (1.7.0)
     marcel (1.0.4)
     memory_profiler (1.1.0)
     mini_portile2 (2.8.8)
@@ -68,16 +69,17 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nkf (0.2.0)
-    nokogiri (1.18.4)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.7.1)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
     pathname (0.4.0)
     power_assert (2.0.5)
+    prism (1.4.0)
     pstore (0.2.0)
     psych (4.0.6)
       stringio
@@ -93,7 +95,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.11.0)
+    rdoc (6.13.1)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     rspec (3.13.0)
@@ -109,22 +111,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.74.0)
+    rubocop (1.75.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
-      parser (>= 3.3.1.0)
-    rubocop-on-rbs (1.4.2)
+    rubocop-ast (1.44.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-on-rbs (1.5.0)
+      lint_roller (~> 1.1)
       rbs (~> 3.5)
-      rubocop (~> 1.61)
+      rubocop (>= 1.72.1, < 2.0)
       zlib
     rubocop-rubycw (0.2.2)
       lint_roller (~> 1.1)
@@ -134,34 +138,37 @@ GEM
       nokogiri
     securerandom (0.4.1)
     stackprof (0.2.27)
-    steep (1.9.4)
+    steep (1.10.0)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
-      language_server-protocol (>= 3.15, < 4.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 3.8)
+      rbs (~> 3.9)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
-      terminal-table (>= 2, < 4)
+      terminal-table (>= 2, < 5)
       uri (>= 0.12.0)
-    stringio (3.1.5)
+    stringio (3.1.6)
     strong_json (2.1.2)
     strscan (3.1.2)
     tempfile (0.3.1)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    test-unit (3.6.7)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    test-unit (3.6.8)
       power_assert
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.3)
     zlib (3.2.1)
 

Rakefile

@@ -22,10 +22,14 @@ end
 Rake::TestTask.new(test: :compile, &test_config)
 
 unless Gem.win_platform?
-  require "ruby_memcheck"
+  begin
+    require "ruby_memcheck"
 
-  namespace :test do
-    RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
+    namespace :test do
+      RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
+    end
+  rescue LoadError => exn
+    STDERR.puts "🚨🚨🚨🚨 Skipping RubyMemcheck: #{exn.inspect} 🚨🚨🚨🚨"
   end
 end
 
@@ -139,16 +143,21 @@ task :stdlib_test => :compile do
 end
 
 task :typecheck_test => :compile do
-  FileList["test/typecheck/*"].each do |test|
-    Dir.chdir(test) do
-      expectations = File.join(test, "steep_expectations.yml")
-      if File.exist?(expectations)
-        sh "steep check --with_expectations"
-      else
-        sh "steep check"
-      end
-    end
-  end
+  puts
+  puts
+  puts "⛔️⛔️⛔️⛔️⛔️⛔️ Skipping type check test because RBS is incompatible with Steep (#{__FILE__}:#{__LINE__})"
+  puts
+  puts
+  # FileList["test/typecheck/*"].each do |test|
+  #   Dir.chdir(test) do
+  #     expectations = File.join(test, "steep_expectations.yml")
+  #     if File.exist?(expectations)
+  #       sh "steep check --with_expectations"
+  #     else
+  #       sh "steep check"
+  #     end
+  #   end
+  # end
 end
 
 task :raap => :compile do

Steepfile

@@ -9,6 +9,7 @@ target :lib do
   )
 
   library "pathname", "json", "logger", "monitor", "tsort", "uri", 'dbm', 'pstore', 'singleton', 'shellwords', 'fileutils', 'find', 'digest', 'prettyprint', 'yaml', "psych", "securerandom"
+  library "prism"
   signature "stdlib/strscan/0/"
   signature "stdlib/optparse/0/"
   signature "stdlib/rdoc/0/"

core/kernel.rbs

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

core/module.rbs

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

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

core/string.rbs

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