[pull] master from ruby:master

NEWS.md

@@ -130,6 +130,8 @@ Note: We're only listing outstanding class updates.
       `String#bit_count` handle individual bits, and `String#bitwise_not`,
       `String#bitwise_and`, `String#bitwise_or`, `String#bitwise_xor`
       (with their `!` variants) handle whole strings. [[Feature #22118]]
+    * `String#tr` now accept a Hash for multi-character replacement.
+      [[Feature #22238]]
 
 * Symbol
 
@@ -376,6 +378,7 @@ A lot of work has gone into making Ractors more stable, performant, and usable.
 [Feature #22175]: https://bugs.ruby-lang.org/issues/22175
 [Feature #22185]: https://bugs.ruby-lang.org/issues/22185
 [Feature #22205]: https://bugs.ruby-lang.org/issues/22205
+[Feature #22238]: https://bugs.ruby-lang.org/issues/22238
 [PR #17201]: https://github.com/ruby/ruby/pull/17201
 [GH-psych #805]: https://github.com/ruby/psych/pull/805
 [RubyGems-v4.0.4]: https://github.com/rubygems/rubygems/releases/tag/v4.0.4

lib/prism/parse_result.rb

@@ -744,6 +744,8 @@ class InlineComment < Comment
     #: () -> bool
     def trailing?
       !location.start_line_slice.strip.empty?
+    rescue ArgumentError # invalid bytes, never whitespace only
+      false
     end
 
     # Returns a string representation of this comment.

test/prism/result/comments_test.rb

@@ -39,6 +39,16 @@ def foo
       )
     end
 
+    def test_comment_trailing
+      comment = Prism.parse_comments("x # trailing")[0]
+      assert_predicate(comment, :trailing?)
+    end
+
+    def test_comment_syntax_invalid_bytes_trailing
+      comment = Prism.parse_comments("\xFF\xFE# not trailing")[0]
+      refute_predicate(comment, :trailing?)
+    end
+
     def test___END__
       result = Prism.parse(<<~RUBY)
         __END__