Skip to content

Commit 9ff5bfd

Browse files
authored
[rust] bumps wasmtime crate to v18 (#443)
* [rust] bumps wasmtime crate to v18 * [rust] updates Cargo.lock * [rust] remove all deprecated attributes of cargo-deny
1 parent 27f7e8f commit 9ff5bfd

File tree

9 files changed

+91
-146
lines changed

9 files changed

+91
-146
lines changed

rust/Cargo.lock

+79-127
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/deny.toml

-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
[advisories]
22
db-path = "~/.cargo/advisory-db"
33
db-urls = ["https://github.com/rustsec/advisory-db"]
4-
vulnerability = "deny"
5-
unmaintained = "warn"
64
yanked = "warn"
7-
notice = "warn"
85
ignore = ["RUSTSEC-2020-0168"]
96

107
[licenses]
11-
unlicensed = "deny"
128
allow = [
139
"0BSD",
1410
"Apache-2.0",
@@ -21,10 +17,6 @@ allow = [
2117
"MPL-2.0",
2218
"Unicode-DFS-2016",
2319
]
24-
deny = []
25-
copyleft = "warn"
26-
allow-osi-fsf-free = "neither"
27-
default = "deny"
2820
confidence-threshold = 0.8
2921

3022
[licenses.private]

rust/plugin_wasm/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ notify = { version = "6", default-features = false, features = [
1414
parking_lot = "0.12"
1515
tracing = { version = "0.1", default-features = false, features = ["std"] }
1616
tracing-subscriber = "0.3"
17-
wasmtime = { version = "17", default-features = false, features = [
17+
wasmtime = { version = "18", default-features = false, features = [
1818
"cranelift",
1919
] }
20-
wasmtime-wasi = { version = "17" }
20+
wasmtime-wasi = { version = "18" }
21+
wasi-common = { version = "18" }
2122
walkdir = "2"
2223
zerocopy = "0.7"
2324

@@ -30,7 +31,6 @@ rand = "0.8"
3031
pretty_assertions = "1"
3132
assert_matches = "1"
3233
async-trait = { version = "0.1" }
33-
wasi-common = { version = "17" }
3434
futures = { version = "0.3" }
3535

3636
[lib]

rust/plugin_wasm/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use core::slice;
88
use std::mem::size_of;
99

1010
use anyhow::Result;
11+
use wasi_common::WasiCtx;
1112
use wasmtime::{AsContextMut, Instance, Memory, TypedFunc};
1213
use zerocopy::AsBytes;
1314

@@ -49,7 +50,7 @@ pub(crate) type OpaquePtr = u32;
4950
pub(crate) type ByteArray = u32;
5051
pub(crate) type SizePtr = u32;
5152
pub(crate) type StatusPtr = u32;
52-
type Store = wasmtime::Store<wasmtime_wasi::WasiCtx>;
53+
type Store = wasmtime::Store<WasiCtx>;
5354

5455
fn notify_export_function_error(name: &str) {
5556
tracing::warn!(

rust/plugin_wasm/src/model/plugin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use std::path::{Path, PathBuf};
88

99
use anyhow::Result;
10+
use wasi_common::WasiCtx;
1011
use wasmtime::{AsContextMut, Instance, Linker, Module};
11-
use wasmtime_wasi::WasiCtx;
1212

1313
use crate::{
1414
inner_count_all_functions, inner_create_opaque, inner_destroy_opaque, inner_execute,

rust/plugin_wasm/src/model/test/full.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use assert_matches::assert_matches;
99
use maplit::hashmap;
1010
use pretty_assertions::assert_eq;
1111
use serde_json::json;
12-
use wasmtime_wasi::WasiFile;
12+
use wasi_common::WasiFile;
1313

1414
use crate::model::{
1515
controller::ModelIOPluginController,

rust/plugin_wasm/src/model/test/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ use serde_derive::{Deserialize, Serialize};
2020
use serde_json::Value;
2121
use wasi_common::{
2222
file::{FileType, Filestat},
23-
snapshots::preview_1::types::Error,
23+
snapshots::preview_1::types::Error, WasiFile,
2424
};
2525
use wasmtime::{Engine, Linker};
26-
use wasmtime_wasi::{WasiCtxBuilder, WasiFile};
26+
use wasmtime_wasi::WasiCtxBuilder;
2727

2828
use crate::Store;
2929

rust/plugin_wasm/src/motion/plugin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use std::{
1010
};
1111

1212
use anyhow::Result;
13+
use wasi_common::WasiCtx;
1314
use wasmtime::{AsContextMut, Instance, Linker, Module};
14-
use wasmtime_wasi::WasiCtx;
1515

1616
use crate::{
1717
allocate_byte_array_with_data, allocate_status_ptr, inner_count_all_functions,

rust/plugin_wasm/src/motion/test/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ use serde_derive::{Deserialize, Serialize};
2020
use serde_json::Value;
2121
use wasi_common::{
2222
file::{FileType, Filestat},
23-
snapshots::preview_1::types::Error,
23+
snapshots::preview_1::types::Error, WasiFile,
2424
};
2525
use wasmtime::{Engine, Linker};
26-
use wasmtime_wasi::{WasiCtxBuilder, WasiFile};
26+
use wasmtime_wasi::WasiCtxBuilder;
2727

2828
use crate::{motion::controller::MotionIOPluginController, Store};
2929

0 commit comments

Comments
 (0)