[pull] master from ruby:master

.github/workflows/ubuntu.yml

@@ -208,7 +208,7 @@ jobs:
       matrix:
         include:
           # Using the same setup as ZJIT jobs
-          - bench_opts: '--warmup=1 --bench=1 --excludes=lobsters'
+          - bench_opts: '--warmup=1 --bench=1 --excludes=lobsters,ruby-lsp'
 
     runs-on: ubuntu-24.04
 

.github/workflows/zjit-macos.yml

@@ -158,7 +158,7 @@ jobs:
         include:
           # Test --call-threshold=2 with 2 iterations in total
           - ruby_opts: '--zjit-call-threshold=2'
-            bench_opts: '--warmup=1 --bench=1 --excludes=lobsters'
+            bench_opts: '--warmup=1 --bench=1 --excludes=lobsters,ruby-lsp'
             configure: '--enable-zjit=dev_nodebug' # --enable-zjit=dev is too slow
 
     runs-on: macos-14

.github/workflows/zjit-ubuntu.yml

@@ -215,7 +215,7 @@ jobs:
         include:
           # Test --call-threshold=2 with 2 iterations in total
           - ruby_opts: '--zjit-call-threshold=2'
-            bench_opts: '--warmup=1 --bench=1 --excludes=lobsters'
+            bench_opts: '--warmup=1 --bench=1 --excludes=lobsters,ruby-lsp'
             configure: '--enable-zjit=dev_nodebug' # --enable-zjit=dev is too slow
 
     runs-on: ubuntu-24.04

NEWS.md

@@ -27,13 +27,18 @@ Note: We're only listing outstanding class updates.
 
 ## Stdlib updates
 
+### The following bundled gems are added.
+
+
 We only list stdlib changes that are notable feature changes.
 
 Other changes are listed in the following sections. We also listed release
 history from the previous bundled version that is Ruby 3.4.0 if it has GitHub
 releases.
 
-### The following bundled gems are promoted from default gems.
+### The following bundled gem is promoted from default gems.
+
+* tsort 0.2.0
 
 ### The following default gem is added.
 
@@ -50,6 +55,7 @@ releases.
 * test-unit 3.7.7
 * rss 0.3.2
 * net-imap 0.6.2
+* rbs 3.10.2
 * typeprof 0.31.1
 * debug 1.11.1
 * mutex_m 0.3.0

doc/maintainers.md

@@ -269,12 +269,6 @@ consensus on ruby-core/ruby-dev.
 * https://github.com/ruby/tmpdir
 * https://rubygems.org/gems/tmpdir
 
-#### lib/tsort.rb
-
-* Tanaka Akira ([akr])
-* https://github.com/ruby/tsort
-* https://rubygems.org/gems/tsort
-
 #### lib/un.rb
 
 * WATANABE Hirofumi ([eban])
@@ -628,6 +622,12 @@ It may needs to make consensus on ruby-core/ruby-dev before making major changes
 * https://github.com/ruby/repl_type_completor
 * https://rubygems.org/gems/repl_type_completor
 
+#### tsort
+
+* Tanaka Akira ([akr])
+* https://github.com/ruby/tsort
+* https://rubygems.org/gems/tsort
+
 ## Platform Maintainers
 
 ### mswin64 (Microsoft Windows)

doc/standard_library.md

@@ -58,7 +58,6 @@ of each.
 - Time ([GitHub][time]): Extends the Time class with methods for parsing and conversion
 - Timeout ([GitHub][timeout]): Auto-terminate potentially long-running operations in Ruby
 - TmpDir ([GitHub][tmpdir]): Extends the Dir class to manage the OS temporary file path
-- TSort ([GitHub][tsort]): Topological sorting using Tarjan's algorithm
 - UN ([GitHub][un]): Utilities to replace common UNIX commands
 - URI ([GitHub][uri]): A Ruby module providing support for Uniform Resource Identifiers
 - YAML ([GitHub][yaml]): The Ruby client library for the Psych YAML implementation
@@ -126,6 +125,7 @@ of each.
 - [reline][reline-doc] ([GitHub][reline]): GNU Readline and Editline in a pure Ruby implementation
 - [readline]: Wrapper for the Readline extension and Reline
 - [fiddle]: A libffi wrapper for Ruby
+- [tsort]: Topological sorting using Tarjan's algorithm
 
 ## Tools
 

gems/bundled_gems

@@ -18,7 +18,7 @@ net-pop             0.1.2   https://github.com/ruby/net-pop
 net-smtp            0.5.1   https://github.com/ruby/net-smtp
 matrix              0.4.3   https://github.com/ruby/matrix
 prime               0.1.4   https://github.com/ruby/prime
-rbs                 3.10.0  https://github.com/ruby/rbs
+rbs                 3.10.2  https://github.com/ruby/rbs
 typeprof            0.31.1  https://github.com/ruby/typeprof
 debug               1.11.1  https://github.com/ruby/debug
 racc                1.8.1   https://github.com/ruby/racc
@@ -45,3 +45,4 @@ irb                 1.16.0  https://github.com/ruby/irb
 reline              0.6.3   https://github.com/ruby/reline
 readline            0.0.4   https://github.com/ruby/readline
 fiddle              1.1.8   https://github.com/ruby/fiddle
+tsort               0.2.0   https://github.com/ruby/tsort