Skip to content

Commit e5270ae

Browse files
authored
Merge pull request #408 from bytecodealliance/ruby-3.4
Ruby 3.4 update
2 parents 60d5af6 + 3fb6780 commit e5270ae

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: oxidize-rb/actions/setup-ruby-and-rust@v1
2828
with:
29-
ruby-version: "3.3"
29+
ruby-version: "3.4"
3030
rustup-toolchain: "${{ env.NIGHTLY_VERSION }}"
3131
bundler-cache: true
3232
cargo-cache: true

.github/workflows/build-gems.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- uses: oxidize-rb/actions/setup-ruby-and-rust@v1
4444
with:
45-
ruby-version: "3.3"
45+
ruby-version: "3.4"
4646
bundler-cache: true
4747
cargo-cache: true
4848
cargo-vendor: true
@@ -69,7 +69,7 @@ jobs:
6969
strategy:
7070
matrix:
7171
os: ["ubuntu-latest"]
72-
ruby: ["3.3"]
72+
ruby: ["3.4"]
7373
steps:
7474
- uses: actions/checkout@v4
7575

.github/workflows/memcheck.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ on:
77
ruby-version:
88
description: "Ruby version to memcheck"
99
required: true
10-
default: "3.3"
10+
default: "3.4"
1111
type: choice
1212
options:
1313
- "head"
14+
- "3.4"
1415
- "3.3"
1516
- "3.2"
1617
- "3.1"
@@ -37,7 +38,7 @@ jobs:
3738

3839
- uses: oxidize-rb/actions/setup-ruby-and-rust@v1
3940
with:
40-
ruby-version: ${{ inputs.ruby-version || '3.3' }}
41+
ruby-version: ${{ inputs.ruby-version || '3.4' }}
4142
bundler-cache: true
4243
cargo-cache: true
4344
cache-version: v2

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gemfile.lock

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
wasmtime (27.0.0)
5-
rb_sys (~> 0.9.97)
5+
rb_sys (~> 0.9.105)
66

77
GEM
88
remote: https://rubygems.org/
@@ -11,11 +11,11 @@ GEM
1111
benchmark-ips (2.14.0)
1212
bigdecimal (3.1.8)
1313
diff-lcs (1.5.1)
14-
ffi (1.17.0)
15-
ffi (1.17.0-arm64-darwin)
16-
ffi (1.17.0-x64-mingw-ucrt)
17-
ffi (1.17.0-x86_64-darwin)
18-
ffi (1.17.0-x86_64-linux-gnu)
14+
ffi (1.17.1)
15+
ffi (1.17.1-arm64-darwin)
16+
ffi (1.17.1-x64-mingw-ucrt)
17+
ffi (1.17.1-x86_64-darwin)
18+
ffi (1.17.1-x86_64-linux-gnu)
1919
get_process_mem (1.0.0)
2020
bigdecimal (>= 2.0)
2121
ffi (~> 1.0)
@@ -32,7 +32,7 @@ GEM
3232
rake (13.2.1)
3333
rake-compiler (1.2.8)
3434
rake
35-
rb_sys (0.9.102)
35+
rb_sys (0.9.106)
3636
regexp_parser (2.9.2)
3737
rspec (3.13.0)
3838
rspec-core (~> 3.13.0)
@@ -87,6 +87,7 @@ PLATFORMS
8787
arm64-darwin-21
8888
arm64-darwin-22
8989
arm64-darwin-23
90+
arm64-darwin-24
9091
x64-mingw-ucrt
9192
x64-mingw32
9293
x86_64-darwin-19

examples/rust-crate/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ doctest = false
1010
wasmtime-rb = { path = "../../ext", features = ["ruby-api"] }
1111

1212
[dev-dependencies]
13-
magnus = { version = "0.5.5", features = ["embed"] } # Only need embed feature for tests
13+
magnus = { version = "0.7.1", features = ["embed"] } # Only need embed feature for tests
1414
wasmtime-rb = { path = "../../ext", features = ["embed"] } # Only need embed feature for tests

ext/src/ruby_api/component/linker.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ impl Linker {
135135
free_immediately,
136136
unsafe_generics
137137
)]
138-
139138
pub struct LinkerInstance<'a> {
140139
inner: RefCell<MaybeInstanceImpl<'a>>,
141140
refs: RefCell<Vec<Value>>,

ext/src/ruby_api/store.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub enum StoreContextValue<'a> {
262262
Caller(Opaque<Obj<Caller<'a>>>),
263263
}
264264

265-
impl<'a> From<Obj<Store>> for StoreContextValue<'a> {
265+
impl From<Obj<Store>> for StoreContextValue<'_> {
266266
fn from(store: Obj<Store>) -> Self {
267267
StoreContextValue::Store(store.into())
268268
}
@@ -274,7 +274,7 @@ impl<'a> From<Obj<Caller<'a>>> for StoreContextValue<'a> {
274274
}
275275
}
276276

277-
impl<'a> StoreContextValue<'a> {
277+
impl StoreContextValue<'_> {
278278
pub fn mark(&self, marker: &Marker) {
279279
match self {
280280
Self::Store(store) => marker.mark(*store),

spec/unit/component/convert_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def call_func(name, *args)
9494
["variant", Variant.new("no"), /invalid variant case "no", valid cases: \["all", "none", "lt"\]/],
9595
["variant", Variant.new("lt", "nah"), /(variant value for "lt")/],
9696
["enum", "no", /enum variant name `no` is not valid/],
97-
["result", nil, /undefined method `ok\?/],
97+
["result", nil, /undefined method [`']ok\?/], # [`']: various ruby version
9898
["result-unit", Result.ok(""), /expected nil for result<_, E> ok branch/],
9999
["result-unit", Result.error(""), /expected nil for result<O, _> error branch/],
100100
["flags", ["no"], /unknown flag: `no`/],

wasmtime.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
2929

3030
spec.rdoc_options += ["--exclude", "vendor"]
3131

32-
spec.add_dependency "rb_sys", "~> 0.9.97"
32+
spec.add_dependency "rb_sys", "~> 0.9.105"
3333
end

0 commit comments

Comments
 (0)