Skip to content

Commit 8af7b4e

Browse files
kddnewtonkddnewton
authored
Merge pull request ruby#3518 from ruby/update-deps
2 parents 4e33f53 + 594e2a6 commit 8af7b4e

File tree

19 files changed

+239
-125
lines changed

19 files changed

+239
-125
lines changed

‎Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
9+
ast (2.4.3)
1010
benchmark-ips (2.14.0)
1111
date (3.4.1)
1212
ffi (1.17.1)
1313
mini_portile2 (2.8.8)
14-
nokogiri (1.18.2)
14+
nokogiri (1.18.5)
1515
mini_portile2 (~> 2.8.2)
1616
racc (~> 1.4)
1717
onigmo (0.1.0)
@@ -26,15 +26,15 @@ GEM
2626
rake (13.2.1)
2727
rake-compiler (1.2.9)
2828
rake
29-
rdoc (6.11.0)
29+
rdoc (6.12.0)
3030
psych (>= 4.0.0)
3131
ruby_memcheck (3.0.1)
3232
nokogiri
3333
ruby_parser (3.21.1)
3434
racc (~> 1.5)
3535
sexp_processor (~> 4.16)
3636
sexp_processor (4.17.3)
37-
stringio (3.1.2)
37+
stringio (3.1.5)
3838
test-unit (3.6.7)
3939
power_assert
4040

‎Steepfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ target :lib do
1212
ignore "lib/prism/lex_compat.rb"
1313
ignore "lib/prism/serialize.rb"
1414
ignore "lib/prism/ffi.rb"
15-
ignore "lib/prism/polyfill/byteindex.rb"
1615
ignore "lib/prism/translation"
16+
17+
ignore "lib/prism/polyfill/append_as_bytes.rb"
18+
ignore "lib/prism/polyfill/byteindex.rb"
19+
ignore "lib/prism/polyfill/unpack1.rb"
1720
end

‎gemfiles/3.1/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
10-
logger (1.6.5)
9+
ast (2.4.3)
10+
logger (1.6.6)
1111
mini_portile2 (2.8.8)
12-
nokogiri (1.18.3)
12+
nokogiri (1.18.5)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
2121
rake (13.2.1)
2222
rake-compiler (1.2.9)
2323
rake
24-
rbs (3.8.1)
24+
rbs (3.9.0)
2525
logger
2626
ruby_memcheck (3.0.1)
2727
nokogiri

‎gemfiles/3.2/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
10-
logger (1.6.5)
9+
ast (2.4.3)
10+
logger (1.6.6)
1111
mini_portile2 (2.8.8)
12-
nokogiri (1.18.3)
12+
nokogiri (1.18.5)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
2121
rake (13.2.1)
2222
rake-compiler (1.2.9)
2323
rake
24-
rbs (3.8.1)
24+
rbs (3.9.0)
2525
logger
2626
ruby_memcheck (3.0.1)
2727
nokogiri

‎gemfiles/3.3/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
10-
logger (1.6.5)
9+
ast (2.4.3)
10+
logger (1.6.6)
1111
mini_portile2 (2.8.8)
12-
nokogiri (1.18.3)
12+
nokogiri (1.18.5)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
2121
rake (13.2.1)
2222
rake-compiler (1.2.9)
2323
rake
24-
rbs (3.8.1)
24+
rbs (3.9.0)
2525
logger
2626
ruby_memcheck (3.0.1)
2727
nokogiri

‎gemfiles/3.4/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
10-
logger (1.6.5)
9+
ast (2.4.3)
10+
logger (1.6.6)
1111
mini_portile2 (2.8.8)
12-
nokogiri (1.18.4)
12+
nokogiri (1.18.5)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -21,7 +21,7 @@ GEM
2121
rake (13.2.1)
2222
rake-compiler (1.2.9)
2323
rake
24-
rbs (3.8.1)
24+
rbs (3.9.0)
2525
logger
2626
ruby_memcheck (3.0.1)
2727
nokogiri

‎gemfiles/3.5/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
9+
ast (2.4.3)
1010
ffi (1.17.1)
11-
logger (1.6.5)
11+
logger (1.6.6)
1212
mini_portile2 (2.8.8)
13-
nokogiri (1.18.3)
13+
nokogiri (1.18.5)
1414
mini_portile2 (~> 2.8.2)
1515
racc (~> 1.4)
1616
onigmo (0.1.0)
@@ -22,7 +22,7 @@ GEM
2222
rake (13.2.1)
2323
rake-compiler (1.2.9)
2424
rake
25-
rbs (3.8.1)
25+
rbs (3.9.0)
2626
logger
2727
ruby_memcheck (3.0.1)
2828
nokogiri

‎gemfiles/jruby/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
9+
ast (2.4.3)
1010
parser (3.3.7.2)
1111
ast (~> 2.4.1)
1212
racc

‎gemfiles/truffleruby/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
ast (2.4.2)
9+
ast (2.4.3)
1010
parser (3.3.7.2)
1111
ast (~> 2.4.1)
1212
racc

‎gemfiles/typecheck/Gemfile.lock

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (8.0.1)
4+
activesupport (8.0.2)
55
base64
66
benchmark (>= 0.3)
77
bigdecimal
@@ -14,34 +14,35 @@ GEM
1414
securerandom (>= 0.3)
1515
tzinfo (~> 2.0, >= 2.0.5)
1616
uri (>= 0.13.1)
17-
ast (2.4.2)
17+
ast (2.4.3)
1818
base64 (0.2.0)
1919
benchmark (0.4.0)
2020
bigdecimal (3.1.9)
2121
concurrent-ruby (1.3.5)
2222
connection_pool (2.5.0)
23-
csv (3.3.2)
23+
csv (3.3.3)
2424
drb (2.2.1)
2525
erubi (1.13.1)
2626
ffi (1.17.1-arm64-darwin)
2727
ffi (1.17.1-x86_64-linux-gnu)
2828
fileutils (1.7.3)
2929
i18n (1.14.7)
3030
concurrent-ruby (~> 1.0)
31-
json (2.9.1)
31+
json (2.10.2)
3232
language_server-protocol (3.17.0.4)
3333
listen (3.9.0)
3434
rb-fsevent (~> 0.10, >= 0.10.3)
3535
rb-inotify (~> 0.9, >= 0.9.10)
36-
logger (1.6.5)
37-
minitest (5.25.4)
36+
logger (1.6.6)
37+
minitest (5.25.5)
38+
mutex_m (0.3.0)
3839
netrc (0.11.0)
3940
parallel (1.26.3)
4041
parser (3.3.7.2)
4142
ast (~> 2.4.1)
4243
racc
4344
power_assert (2.0.5)
44-
prism (1.3.0)
45+
prism (1.4.0)
4546
racc (1.8.1)
4647
rainbow (3.1.1)
4748
rake (13.2.1)
@@ -50,45 +51,47 @@ GEM
5051
rb-fsevent (0.11.2)
5152
rb-inotify (0.11.1)
5253
ffi (~> 1.0)
53-
rbi (0.2.4)
54+
rbi (0.3.1)
5455
prism (~> 1.0)
56+
rbs (>= 3.4.4)
5557
sorbet-runtime (>= 0.5.9204)
56-
rbs (3.8.1)
58+
rbs (3.9.0)
5759
logger
5860
ruby_parser (3.21.1)
5961
racc (~> 1.5)
6062
sexp_processor (~> 4.16)
6163
securerandom (0.4.1)
6264
sexp_processor (4.17.3)
63-
sorbet (0.5.11911)
64-
sorbet-static (= 0.5.11911)
65-
sorbet-runtime (0.5.11911)
66-
sorbet-static (0.5.11911-universal-darwin)
67-
sorbet-static (0.5.11911-x86_64-linux)
68-
sorbet-static-and-runtime (0.5.11911)
69-
sorbet (= 0.5.11911)
70-
sorbet-runtime (= 0.5.11911)
71-
spoom (1.5.4)
65+
sorbet (0.5.11953)
66+
sorbet-static (= 0.5.11953)
67+
sorbet-runtime (0.5.11953)
68+
sorbet-static (0.5.11953-universal-darwin)
69+
sorbet-static (0.5.11953-x86_64-linux)
70+
sorbet-static-and-runtime (0.5.11953)
71+
sorbet (= 0.5.11953)
72+
sorbet-runtime (= 0.5.11953)
73+
spoom (1.6.1)
7274
erubi (>= 1.10.0)
7375
prism (>= 0.28.0)
7476
rbi (>= 0.2.3)
7577
sorbet-static-and-runtime (>= 0.5.10187)
7678
thor (>= 0.19.2)
77-
steep (1.9.4)
79+
steep (1.10.0)
7880
activesupport (>= 5.1)
7981
concurrent-ruby (>= 1.1.10)
8082
csv (>= 3.0.9)
8183
fileutils (>= 1.1.0)
8284
json (>= 2.1.0)
83-
language_server-protocol (>= 3.15, < 4.0)
85+
language_server-protocol (>= 3.17.0.4, < 4.0)
8486
listen (~> 3.0)
8587
logger (>= 1.3.0)
88+
mutex_m (>= 0.3.0)
8689
parser (>= 3.1)
8790
rainbow (>= 2.2.2, < 4.0)
88-
rbs (~> 3.8)
91+
rbs (~> 3.9)
8992
securerandom (>= 0.1)
9093
strscan (>= 1.0.0)
91-
terminal-table (>= 2, < 4)
94+
terminal-table (>= 2, < 5)
9295
uri (>= 0.12.0)
9396
strscan (3.1.2)
9497
tapioca (0.16.11)
@@ -101,14 +104,16 @@ GEM
101104
spoom (>= 1.2.0)
102105
thor (>= 1.2.0)
103106
yard-sorbet
104-
terminal-table (3.0.2)
105-
unicode-display_width (>= 1.1.1, < 3)
107+
terminal-table (4.0.0)
108+
unicode-display_width (>= 1.1.1, < 4)
106109
test-unit (3.6.7)
107110
power_assert
108111
thor (1.3.2)
109112
tzinfo (2.0.6)
110113
concurrent-ruby (~> 1.0)
111-
unicode-display_width (2.6.0)
114+
unicode-display_width (3.1.4)
115+
unicode-emoji (~> 4.0, >= 4.0.4)
116+
unicode-emoji (4.0.4)
112117
uri (1.0.3)
113118
yard (0.9.37)
114119
yard-sorbet (0.9.0)

‎prism.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ Gem::Specification.new do |spec|
136136
"sig/prism/node.rbs",
137137
"sig/prism/pack.rbs",
138138
"sig/prism/parse_result.rbs",
139+
"sig/prism/parse_result/comments.rbs",
139140
"sig/prism/pattern.rbs",
140141
"sig/prism/reflection.rbs",
141142
"sig/prism/relocation.rbs",

‎sig/_shims/module.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class Module < Object
88

99
# "define_method" accepts a block that's evaluated within
1010
# the context of the instance:
11-
def define_method: (id symbol) { () [self: instance] -> untyped } -> Symbol
11+
def define_method: (interned symbol) { () [self: instance] -> untyped } -> Symbol
1212
| ...
1313
end

‎sig/prism/_private/parse_result.rbs

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,6 @@ module Prism
2727
def attach_comments!: () -> void
2828
def mark_newlines!: () -> untyped
2929

30-
class Comments
31-
interface _Target
32-
def start_offset: () -> Integer
33-
def end_offset: () -> Integer
34-
def encloses?: (comment) -> bool
35-
def <<: (comment) -> void
36-
end
37-
38-
class NodeTarget
39-
include _Target
40-
41-
attr_reader node: Prism::node
42-
43-
def initialize: (Prism::node) -> void
44-
end
45-
46-
class LocationTarget
47-
include _Target
48-
49-
attr_reader location: Location
50-
51-
def initialize: (Location) -> void
52-
end
53-
54-
attr_reader parse_result: ParseResult
55-
56-
def initialize: (ParseResult) -> void
57-
def attach!: () -> void
58-
59-
private
60-
61-
def nearest_targets: (Prism::node, comment) -> (untyped | ::Array[untyped])
62-
end
63-
6430
class Errors
6531
attr_reader parse_result: ParseResult
6632

0 commit comments

Comments
 (0)