Skip to content

Commit f347cf9

Browse files
authored
Merge pull request #2206 from ruby/ruby-3.4.1
Ruby 3.4.1
2 parents b7271dd + a38168b commit f347cf9

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
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.0-rc1"
19+
ruby-version: "3.4.1"
2020
bundler: none
2121
- name: Install dependencies
2222
run: |

.github/workflows/ruby.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: ['3.1', '3.2', '3.3', '3.4.0-rc1', head]
16+
ruby: ['3.1', '3.2', '3.3', '3.4', head]
1717
rubyopt: [""]
1818
job:
1919
- test
2020
include:
2121
- ruby: head
2222
job: stdlib_test rubocop
23-
- ruby: "3.4.0-rc1"
23+
- ruby: "3.4"
2424
job: stdlib_test
25-
- ruby: "3.4.0-rc1"
25+
- ruby: "3.4"
2626
job: test
2727
rubyopt: "--enable-frozen-string-literal"
28-
- ruby: "3.4.0-rc1"
28+
- ruby: "3.4"
2929
job: stdlib_test
3030
rubyopt: "--enable-frozen-string-literal"
31-
- ruby: "3.4.0-rc1"
31+
- ruby: "3.4"
3232
job: lexer templates compile confirm_lexer confirm_templates
33-
- ruby: "3.4.0-rc1"
33+
- ruby: "3.4"
3434
job: rubocop validate test_doc build test_generate_stdlib raap
35-
- ruby: "3.4.0-rc1"
35+
- ruby: "3.4"
3636
job: typecheck_test
3737
env:
3838
RANDOMIZE_STDLIB_TEST_ORDER: "true"

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ GEM
122122
ruby-progressbar (1.13.0)
123123
securerandom (0.4.1)
124124
stackprof (0.2.26)
125-
steep (1.9.2)
125+
steep (1.9.3)
126126
activesupport (>= 5.1)
127127
concurrent-ruby (>= 1.1.10)
128128
csv (>= 3.0.9)
@@ -133,7 +133,7 @@ GEM
133133
logger (>= 1.3.0)
134134
parser (>= 3.1)
135135
rainbow (>= 2.2.2, < 4.0)
136-
rbs (~> 3.7.0)
136+
rbs (~> 3.8)
137137
securerandom (>= 0.1)
138138
strscan (>= 1.0.0)
139139
terminal-table (>= 2, < 4)

core/ractor.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ class Ractor
603603
# }
604604
# }.map(&:value).uniq.size #=> 1 and f() is called only once
605605
#
606-
def self.store_if_absent: (Symbol) { () -> untyped } -> untyped
606+
def self.store_if_absent: [A] (Symbol) { (nil) -> A } -> A
607607

608608
# <!--
609609
# rdoc-file=ractor.rb

test/stdlib/Ractor_test.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def test_main
4040

4141
def test_main?
4242
if_ruby("3.4"...) do
43-
# FIXME: 3.4.0-rc1 ships with a bug that returns Integer instead of bool
44-
assert_send_type "() -> boolish", Ractor, :main?
43+
assert_send_type "() -> bool", Ractor, :main?
4544
end
4645
end
4746

@@ -108,6 +107,13 @@ def test_shareable?
108107
Ractor, :shareable?, []
109108
end
110109

110+
def test_store_if_absent
111+
assert_send_type(
112+
"(Symbol) { (nil) -> true } -> true",
113+
Ractor, :store_if_absent, :test_store_if_absent, &->(_x) { true }
114+
)
115+
end
116+
111117
def test_yield
112118
Ractor.new(Ractor.current) { |r| loop { r.take } }
113119

0 commit comments

Comments
 (0)