Skip to content

Commit 9ebddb0

Browse files
committed
Merge remote-tracking branch 'upstream/master' into ksss/fix-invalid-position-range
# Conflicts: # test/rbs/parser_test.rb
2 parents 7cc8a14 + 88597ed commit 9ebddb0

17 files changed

Lines changed: 1364 additions & 391 deletions

File tree

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ gem "net-smtp"
4848
gem 'csv'
4949
gem 'ostruct'
5050
gem 'pstore'
51+
gem "timeout"
5152

5253
group :minitest do
5354
gem "minitest"

Gemfile.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/soutaro/steep.git
3-
revision: fdaad2dee750a982a44723d0d3449e03da2ec9fd
3+
revision: 727014c361ae996a80b87948510c83ca480f5e82
44
specs:
55
steep (2.1.0.dev)
66
concurrent-ruby (>= 1.1.10)
@@ -53,7 +53,7 @@ GEM
5353
ast (2.4.3)
5454
base64 (0.3.0)
5555
benchmark (0.5.0)
56-
benchmark-ips (2.14.0)
56+
benchmark-ips (2.15.1)
5757
bigdecimal (4.1.2)
5858
concurrent-ruby (1.3.6)
5959
connection_pool (3.0.2)
@@ -79,7 +79,7 @@ GEM
7979
prism (>= 1.3.0)
8080
rdoc (>= 4.0.0)
8181
reline (>= 0.4.2)
82-
json (2.19.5)
82+
json (2.19.7)
8383
json-schema (6.2.0)
8484
addressable (~> 2.8)
8585
bigdecimal (>= 3.1, < 5)
@@ -90,7 +90,7 @@ GEM
9090
rb-fsevent (~> 0.10, >= 0.10.3)
9191
rb-inotify (~> 0.9, >= 0.9.10)
9292
logger (1.7.0)
93-
marcel (1.1.0)
93+
marcel (1.2.1)
9494
memory_profiler (1.1.0)
9595
minitest (6.0.6)
9696
drb (~> 2.0)
@@ -148,7 +148,7 @@ GEM
148148
diff-lcs (>= 1.2.0, < 2.0)
149149
rspec-support (~> 3.13.0)
150150
rspec-support (3.13.7)
151-
rubocop (1.86.2)
151+
rubocop (1.87.0)
152152
json (~> 2.3)
153153
language_server-protocol (~> 3.17.0.2)
154154
lint_roller (~> 1.1.0)
@@ -231,6 +231,7 @@ DEPENDENCIES
231231
steep!
232232
tempfile
233233
test-unit
234+
timeout
234235

235236
BUNDLED WITH
236237
4.0.1

core/io.rbs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,24 @@ class IO < Object
12301230
#
12311231
def ioctl: (Integer integer_cmd, String | Integer argument) -> Integer
12321232

1233+
# <!--
1234+
# rdoc-file=ext/etc/etc.c
1235+
# - pathconf(name) -> Integer
1236+
# -->
1237+
# Returns pathname configuration variable using fpathconf().
1238+
#
1239+
# *name* should be a constant under `Etc` which begins with `PC_`.
1240+
#
1241+
# The return value is an integer or nil. nil means indefinite limit.
1242+
# (fpathconf() returns -1 but errno is not set.)
1243+
#
1244+
# require 'etc'
1245+
# IO.pipe {|r, w|
1246+
# p w.pathconf(Etc::PC_PIPE_BUF) #=> 4096
1247+
# }
1248+
#
1249+
def pathconf: (Integer name) -> Integer?
1250+
12331251
# <!--
12341252
# rdoc-file=io.c
12351253
# - isatty -> true or false

0 commit comments

Comments
 (0)