Skip to content

Commit c248581

Browse files
authored
Merge pull request #2611 from ruby/bundle-update-20250717-e15545b9
bundle update (2025-07-17)
2 parents 7cc4f95 + af62a6b commit c248581

File tree

13 files changed

+63
-26
lines changed

13 files changed

+63
-26
lines changed

.github/workflows/comments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: "3.4.1"
19+
ruby-version: "3.4.5"
2020
bundler: none
2121
- name: Install dependencies
2222
run: |

Gemfile.lock

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,20 @@ GEM
3131
public_suffix (>= 2.0.2, < 7.0)
3232
ast (2.4.3)
3333
base64 (0.3.0)
34-
benchmark (0.4.0)
34+
benchmark (0.4.1)
3535
benchmark-ips (2.14.0)
3636
bigdecimal (3.2.2)
3737
concurrent-ruby (1.3.5)
3838
connection_pool (2.5.3)
39-
csv (3.3.4)
39+
csv (3.3.5)
4040
dbm (1.1.0)
4141
diff-lcs (1.6.2)
4242
digest (3.2.0)
4343
drb (2.2.3)
44-
erb (5.0.1)
44+
erb (5.0.2)
4545
extconf_compile_commands_json (0.0.7)
4646
ffi (1.17.2)
47+
ffi (1.17.2-arm64-darwin)
4748
ffi (1.17.2-x86_64-linux-gnu)
4849
fileutils (1.7.3)
4950
goodcheck (3.1.0)
@@ -54,7 +55,7 @@ GEM
5455
i18n (1.14.7)
5556
concurrent-ruby (~> 1.0)
5657
json (2.12.2)
57-
json-schema (5.1.1)
58+
json-schema (5.2.1)
5859
addressable (~> 2.8)
5960
bigdecimal (~> 3.1)
6061
language_server-protocol (3.17.0.5)
@@ -72,9 +73,11 @@ GEM
7273
net-smtp (0.5.1)
7374
net-protocol
7475
nkf (0.2.0)
76+
nokogiri (1.18.8-arm64-darwin)
77+
racc (~> 1.4)
7578
nokogiri (1.18.8-x86_64-linux-gnu)
7679
racc (~> 1.4)
77-
ostruct (0.6.1)
80+
ostruct (0.6.2)
7881
parallel (1.27.0)
7982
parser (3.3.8.0)
8083
ast (~> 2.4.1)
@@ -97,15 +100,15 @@ GEM
97100
rb-fsevent (0.11.2)
98101
rb-inotify (0.11.1)
99102
ffi (~> 1.0)
100-
rdoc (6.14.0)
103+
rdoc (6.14.2)
101104
erb
102105
psych (>= 4.0.0)
103106
regexp_parser (2.10.0)
104107
rspec (3.13.1)
105108
rspec-core (~> 3.13.0)
106109
rspec-expectations (~> 3.13.0)
107110
rspec-mocks (~> 3.13.0)
108-
rspec-core (3.13.4)
111+
rspec-core (3.13.5)
109112
rspec-support (~> 3.13.0)
110113
rspec-expectations (3.13.5)
111114
diff-lcs (>= 1.2.0, < 2.0)
@@ -114,18 +117,18 @@ GEM
114117
diff-lcs (>= 1.2.0, < 2.0)
115118
rspec-support (~> 3.13.0)
116119
rspec-support (3.13.4)
117-
rubocop (1.75.8)
120+
rubocop (1.78.0)
118121
json (~> 2.3)
119122
language_server-protocol (~> 3.17.0.2)
120123
lint_roller (~> 1.1.0)
121124
parallel (~> 1.10)
122125
parser (>= 3.3.0.2)
123126
rainbow (>= 2.2.2, < 4.0)
124127
regexp_parser (>= 2.9.3, < 3.0)
125-
rubocop-ast (>= 1.44.0, < 2.0)
128+
rubocop-ast (>= 1.45.1, < 2.0)
126129
ruby-progressbar (~> 1.7)
127130
unicode-display_width (>= 2.4.0, < 4.0)
128-
rubocop-ast (1.44.1)
131+
rubocop-ast (1.46.0)
129132
parser (>= 3.3.7.2)
130133
prism (~> 1.4)
131134
rubocop-on-rbs (1.8.0)
@@ -164,7 +167,7 @@ GEM
164167
tempfile (0.3.1)
165168
terminal-table (4.0.0)
166169
unicode-display_width (>= 1.1.1, < 4)
167-
test-unit (3.6.8)
170+
test-unit (3.7.0)
168171
power_assert
169172
timeout (0.4.3)
170173
tsort (0.2.0)
@@ -177,6 +180,7 @@ GEM
177180
zlib (3.2.1)
178181

179182
PLATFORMS
183+
arm64-darwin
180184
x86_64-linux
181185

182186
DEPENDENCIES

core/io/wait.rbs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,22 @@ class IO
2424
# <!--
2525
# rdoc-file=ext/io/wait/wait.c
2626
# - io.wait(events, timeout) -> event mask, false or nil
27-
# - io.wait(timeout = nil, mode = :read) -> self, true, or false
27+
# - io.wait(*event_symbols[, timeout]) -> self, true, or false
2828
# -->
2929
# Waits until the IO becomes ready for the specified events and returns the
3030
# subset of events that become ready, or a falsy value when times out.
3131
#
3232
# The events can be a bit mask of `IO::READABLE`, `IO::WRITABLE` or
3333
# `IO::PRIORITY`.
3434
#
35-
# Returns a truthy value immediately when buffered data is available.
35+
# Returns an event mask (truthy value) immediately when buffered data is
36+
# available.
3637
#
37-
# Optional parameter `mode` is one of `:read`, `:write`, or `:read_write`.
38+
# The second form: if one or more event symbols (`:read`, `:write`, or
39+
# `:read_write`) are passed, the event mask is the bit OR of the bitmask
40+
# corresponding to those symbols. In this form, `timeout` is optional, the
41+
# order of the arguments is arbitrary, and returns `io` if any of the events is
42+
# ready.
3843
#
3944
# You must require 'io/wait' to use this method.
4045
#

core/kernel.rbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,10 +1814,10 @@ module Kernel : BasicObject
18141814
# and returns a `true` or `false`;
18151815
# returns `false` if either entity does not exist:
18161816
# Character |Test
1817-
# ------------|---------------------------------------------------------------
1818-
# <tt>'<'</tt>|Whether the `mtime` at `path0` is less than that at `path1`.
1819-
# <tt>'='</tt>|Whether the `mtime` at `path0` is equal to that at `path1`.
1820-
# <tt>'>'</tt>|Whether the `mtime` at `path0` is greater than that at `path1`.
1817+
# ------------|------------------------------------------------------------------------------------------------
1818+
# <tt>'<'</tt>|Whether the <code>mtime</code> at <code>path0</code> is less than that at <code>path1</code>.
1819+
# <tt>'='</tt>|Whether the <code>mtime</code> at <code>path0</code> is equal to that at <code>path1</code>.
1820+
# <tt>'>'</tt>|Whether the <code>mtime</code> at <code>path0</code> is greater than that at <code>path1</code>.
18211821
# * This test operates on the content of each of the entities at `path0` and
18221822
# `path1`,
18231823
# and returns a `true` or `false`;

core/ruby_vm.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ module RubyVM::YJIT
686686
# - enable(stats: false, log: false)
687687
# -->
688688
# Enable YJIT compilation. `stats` option decides whether to enable YJIT stats
689-
# or not. `compilation_log` decides
689+
# or not. `log` decides
690690
# whether to enable YJIT compilation logging or not.
691691
# * `stats`:
692692
# * `false`: Don't enable stats.

core/rubygems/rubygems.rbs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,8 +1009,7 @@ module Gem
10091009
# - source_date_epoch_string()
10101010
# -->
10111011
# If the SOURCE_DATE_EPOCH environment variable is set, returns it's value.
1012-
# Otherwise, returns the time that `Gem.source_date_epoch_string` was first
1013-
# called in the same format as SOURCE_DATE_EPOCH.
1012+
# Otherwise, returns DEFAULT_SOURCE_DATE_EPOCH as a string.
10141013
#
10151014
# NOTE(@duckinator): The implementation is a tad weird because we want to:
10161015
# 1. Make builds reproducible by default, by having this function always

core/time.rbs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,10 +984,20 @@ class Time < Object
984984
# now = Time.now
985985
# # => 2022-08-18 10:24:13.5398485 -0500
986986
# now.utc? # => false
987+
# now.getutc.utc? # => true
987988
# utc = Time.utc(2000, 1, 1, 20, 15, 1)
988989
# # => 2000-01-01 20:15:01 UTC
989990
# utc.utc? # => true
990991
#
992+
# `Time` objects created with these methods are considered to be in UTC:
993+
#
994+
# * Time.utc
995+
# * Time#utc
996+
# * Time#getutc
997+
#
998+
# Objects created in other ways will not be treated as UTC even if the
999+
# environment variable "TZ" is "UTC".
1000+
#
9911001
# Related: Time.utc.
9921002
#
9931003
def gmt?: () -> bool
@@ -1560,10 +1570,20 @@ class Time < Object
15601570
# now = Time.now
15611571
# # => 2022-08-18 10:24:13.5398485 -0500
15621572
# now.utc? # => false
1573+
# now.getutc.utc? # => true
15631574
# utc = Time.utc(2000, 1, 1, 20, 15, 1)
15641575
# # => 2000-01-01 20:15:01 UTC
15651576
# utc.utc? # => true
15661577
#
1578+
# `Time` objects created with these methods are considered to be in UTC:
1579+
#
1580+
# * Time.utc
1581+
# * Time#utc
1582+
# * Time#getutc
1583+
#
1584+
# Objects created in other ways will not be treated as UTC even if the
1585+
# environment variable "TZ" is "UTC".
1586+
#
15671587
# Related: Time.utc.
15681588
#
15691589
def utc?: () -> bool

stdlib/rdoc/0/code_object.rbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ module RDoc
2222
# * RDoc::MetaMethod
2323
# * RDoc::Alias
2424
# * RDoc::Constant
25+
# * RDoc::Require
2526
# * RDoc::Mixin
26-
# * RDoc::Require
2727
# * RDoc::Include
28+
# * RDoc::Extend
2829
#
2930
class CodeObject
3031
# <!-- rdoc-file=lib/rdoc/code_object.rb -->

stdlib/rdoc/0/parser.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module RDoc
4242

4343
# <!--
4444
# rdoc-file=lib/rdoc/parser.rb
45-
# - new(top_level, file_name, content, options, stats)
45+
# - new(top_level, content, options, stats)
4646
# -->
4747
# Creates a new Parser storing `top_level`, `file_name`, `content`, `options`
4848
# and `stats` in instance variables. In +@preprocess+ an

stdlib/rdoc/0/store.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module RDoc
2222
class Store
2323
# <!--
2424
# rdoc-file=lib/rdoc/store.rb
25-
# - new(path = nil, type = nil)
25+
# - new(options, path: nil, type: nil)
2626
# -->
2727
# Creates a new Store of `type` that will load or save to `path`
2828
#

0 commit comments

Comments
 (0)