Merge pull request ruby#3518 from ruby/update-deps

kddnewton · web-flow · commit 8af7b4e67107 · 2025-03-23T18:16:34.000-04:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,12 +6,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     benchmark-ips (2.14.0)
     date (3.4.1)
     ffi (1.17.1)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.2)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -26,15 +26,15 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rdoc (6.11.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
     ruby_memcheck (3.0.1)
       nokogiri
     ruby_parser (3.21.1)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
     sexp_processor (4.17.3)
-    stringio (3.1.2)
+    stringio (3.1.5)
     test-unit (3.6.7)
       power_assert
 
diff --git a/Steepfile b/Steepfile
@@ -12,6 +12,9 @@ target :lib do
   ignore "lib/prism/lex_compat.rb"
   ignore "lib/prism/serialize.rb"
   ignore "lib/prism/ffi.rb"
-  ignore "lib/prism/polyfill/byteindex.rb"
   ignore "lib/prism/translation"
+
+  ignore "lib/prism/polyfill/append_as_bytes.rb"
+  ignore "lib/prism/polyfill/byteindex.rb"
+  ignore "lib/prism/polyfill/unpack1.rb"
 end
diff --git a/gemfiles/3.1/Gemfile.lock b/gemfiles/3.1/Gemfile.lock
@@ -6,10 +6,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    logger (1.6.5)
+    ast (2.4.3)
+    logger (1.6.6)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.3)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_memcheck (3.0.1)
       nokogiri
diff --git a/gemfiles/3.2/Gemfile.lock b/gemfiles/3.2/Gemfile.lock
@@ -6,10 +6,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    logger (1.6.5)
+    ast (2.4.3)
+    logger (1.6.6)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.3)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_memcheck (3.0.1)
       nokogiri
diff --git a/gemfiles/3.3/Gemfile.lock b/gemfiles/3.3/Gemfile.lock
@@ -6,10 +6,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    logger (1.6.5)
+    ast (2.4.3)
+    logger (1.6.6)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.3)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_memcheck (3.0.1)
       nokogiri
diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock
@@ -6,10 +6,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    logger (1.6.5)
+    ast (2.4.3)
+    logger (1.6.6)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.4)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_memcheck (3.0.1)
       nokogiri
diff --git a/gemfiles/3.5/Gemfile.lock b/gemfiles/3.5/Gemfile.lock
@@ -6,11 +6,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     ffi (1.17.1)
-    logger (1.6.5)
+    logger (1.6.6)
     mini_portile2 (2.8.8)
-    nokogiri (1.18.3)
+    nokogiri (1.18.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -22,7 +22,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_memcheck (3.0.1)
       nokogiri
diff --git a/gemfiles/jruby/Gemfile.lock b/gemfiles/jruby/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     parser (3.3.7.2)
       ast (~> 2.4.1)
       racc
diff --git a/gemfiles/truffleruby/Gemfile.lock b/gemfiles/truffleruby/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     parser (3.3.7.2)
       ast (~> 2.4.1)
       racc
diff --git a/gemfiles/typecheck/Gemfile.lock b/gemfiles/typecheck/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -14,34 +14,35 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    csv (3.3.2)
+    csv (3.3.3)
     drb (2.2.1)
     erubi (1.13.1)
     ffi (1.17.1-arm64-darwin)
     ffi (1.17.1-x86_64-linux-gnu)
     fileutils (1.7.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.10.2)
     language_server-protocol (3.17.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
-    minitest (5.25.4)
+    logger (1.6.6)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
     netrc (0.11.0)
     parallel (1.26.3)
     parser (3.3.7.2)
       ast (~> 2.4.1)
       racc
     power_assert (2.0.5)
-    prism (1.3.0)
+    prism (1.4.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
@@ -50,45 +51,47 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbi (0.2.4)
+    rbi (0.3.1)
       prism (~> 1.0)
+      rbs (>= 3.4.4)
       sorbet-runtime (>= 0.5.9204)
-    rbs (3.8.1)
+    rbs (3.9.0)
       logger
     ruby_parser (3.21.1)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
     securerandom (0.4.1)
     sexp_processor (4.17.3)
-    sorbet (0.5.11911)
-      sorbet-static (= 0.5.11911)
-    sorbet-runtime (0.5.11911)
-    sorbet-static (0.5.11911-universal-darwin)
-    sorbet-static (0.5.11911-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11911)
-      sorbet (= 0.5.11911)
-      sorbet-runtime (= 0.5.11911)
-    spoom (1.5.4)
+    sorbet (0.5.11953)
+      sorbet-static (= 0.5.11953)
+    sorbet-runtime (0.5.11953)
+    sorbet-static (0.5.11953-universal-darwin)
+    sorbet-static (0.5.11953-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11953)
+      sorbet (= 0.5.11953)
+      sorbet-runtime (= 0.5.11953)
+    spoom (1.6.1)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
       rbi (>= 0.2.3)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
-    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)
     strscan (3.1.2)
     tapioca (0.16.11)
@@ -101,14 +104,16 @@ GEM
       spoom (>= 1.2.0)
       thor (>= 1.2.0)
       yard-sorbet
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-unit (3.6.7)
       power_assert
     thor (1.3.2)
     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)
     yard (0.9.37)
     yard-sorbet (0.9.0)
diff --git a/prism.gemspec b/prism.gemspec
@@ -136,6 +136,7 @@ Gem::Specification.new do |spec|
     "sig/prism/node.rbs",
     "sig/prism/pack.rbs",
     "sig/prism/parse_result.rbs",
+    "sig/prism/parse_result/comments.rbs",
     "sig/prism/pattern.rbs",
     "sig/prism/reflection.rbs",
     "sig/prism/relocation.rbs",
diff --git a/sig/_shims/module.rbs b/sig/_shims/module.rbs
@@ -8,6 +8,6 @@ class Module < Object
 
   # "define_method" accepts a block that's evaluated within
   # the context of the instance:
-  def define_method: (id symbol) { () [self: instance] -> untyped } -> Symbol
+  def define_method: (interned symbol) { () [self: instance] -> untyped } -> Symbol
                    | ...
 end
diff --git a/sig/prism/_private/parse_result.rbs b/sig/prism/_private/parse_result.rbs
@@ -27,40 +27,6 @@ module Prism
     def attach_comments!: () -> void
     def mark_newlines!: () -> untyped
 
-    class Comments
-      interface _Target
-        def start_offset: () -> Integer
-        def end_offset: () -> Integer
-        def encloses?: (comment) -> bool
-        def <<: (comment) -> void
-      end
-
-      class NodeTarget
-        include _Target
-
-        attr_reader node: Prism::node
-
-        def initialize: (Prism::node) -> void
-      end
-
-      class LocationTarget
-        include _Target
-
-        attr_reader location: Location
-
-        def initialize: (Location) -> void
-      end
-
-      attr_reader parse_result: ParseResult
-
-      def initialize: (ParseResult) -> void
-      def attach!: () -> void
-
-      private
-
-      def nearest_targets: (Prism::node, comment) -> (untyped | ::Array[untyped])
-    end
-
     class Errors
       attr_reader parse_result: ParseResult
 
diff --git a/sig/prism/node_ext.rbs b/sig/prism/node_ext.rbs
diff --git a/sig/prism/parse_result.rbs b/sig/prism/parse_result.rbs
diff --git a/sig/prism/parse_result/comments.rbs b/sig/prism/parse_result/comments.rbs
diff --git a/sig/prism/reflection.rbs b/sig/prism/reflection.rbs
diff --git a/templates/lib/prism/node.rb.erb b/templates/lib/prism/node.rb.erb
diff --git a/templates/sig/prism/node.rbs.erb b/templates/sig/prism/node.rbs.erb
