Skip to content

Commit f032275

Browse files
committed
Merge branch 'master' into c-api
2 parents 9e6b6ae + 90f564c commit f032275

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ GEM
3434
benchmark-ips (2.14.0)
3535
bigdecimal (3.1.9)
3636
concurrent-ruby (1.3.5)
37-
connection_pool (2.5.1)
37+
connection_pool (2.5.2)
3838
csv (3.3.4)
3939
dbm (1.1.0)
4040
diff-lcs (1.6.1)

steep/Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ GEM
1919
benchmark (0.4.0)
2020
bigdecimal (3.1.9)
2121
concurrent-ruby (1.3.5)
22-
connection_pool (2.5.1)
22+
connection_pool (2.5.2)
2323
csv (3.3.4)
2424
drb (2.2.1)
2525
ffi (1.17.2)
2626
fileutils (1.7.3)
2727
i18n (1.14.7)
2828
concurrent-ruby (~> 1.0)
29-
json (2.10.2)
29+
json (2.11.3)
3030
language_server-protocol (3.17.0.4)
3131
listen (3.9.0)
3232
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -52,7 +52,7 @@ GEM
5252
rbs (>= 3, < 4)
5353
sorbet-runtime (>= 0.5.10782)
5454
securerandom (0.4.1)
55-
sorbet-runtime (0.5.12032)
55+
sorbet-runtime (0.5.12039)
5656
steep (1.10.0)
5757
activesupport (>= 5.1)
5858
concurrent-ruby (>= 1.1.10)

test/stdlib/global_variables_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def test_gvar_LOAD_PATH(gvar: :$LOAD_PATH)
262262
# is a singleton method), we can't use `assert_send_type` and must use `assert_type`.
263263
loadpath = eval(gvar.to_s)
264264

265-
with_path 'set' do |path|
265+
with_path 'erb' do |path|
266266
assert_type '[:rb | :so, String]', loadpath.resolve_feature_path(path)
267267
end
268268

0 commit comments

Comments
 (0)