Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ authors = ["Emile Fugulin <code@efugulin.com>"]

[dependencies]
futures = { version = "0.3" }
rquickjs = { version = ">=0.10,<0.12", features = ["macro", "futures"] }
rquickjs = { version = "0.14", features = ["macro", "futures"] }
tokio = { version = "1", features = ["full"] }
12 changes: 4 additions & 8 deletions libs/test/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use rquickjs::{
AsyncContext, AsyncRuntime, CatchResultExt, CaughtError, Ctx, FromJs, Function, Module, Result,
async_with,
function::IntoArgs,
module::{Evaluated, ModuleDef},
promise::MaybePromise,
Expand All @@ -15,18 +14,15 @@ where
ctx.with(func);
}

pub async fn test_async_with<F>(func: F)
pub async fn test_async_with<F, R>(func: F)
where
F: for<'js> FnOnce(Ctx<'js>) -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + 'js>>
+ Send,
F: for<'js> AsyncFnOnce(Ctx<'js>) -> R + Send,
R: Send + 'static,
{
let rt = AsyncRuntime::new().unwrap();
let ctx = AsyncContext::full(&rt).await.unwrap();

async_with!(ctx => |ctx| {
func(ctx).await
})
.await;
ctx.async_with(func).await;
}

pub async fn call_test<'js, T, A>(ctx: &Ctx<'js>, module: &Module<'js, Evaluated>, args: A) -> T
Expand Down
2 changes: 1 addition & 1 deletion libs/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ repository = "https://github.com/rquickjs/rquickjs-extra"
authors = ["Emile Fugulin <code@efugulin.com>"]

[dependencies]
rquickjs = { version = ">=0.10,<0.12", features = ["array-buffer"] }
rquickjs = { version = "0.14", features = ["array-buffer"] }
60 changes: 0 additions & 60 deletions libs/utils/src/ffi/c_string.rs

This file was deleted.

39 changes: 0 additions & 39 deletions libs/utils/src/ffi/c_vec.rs

This file was deleted.

5 changes: 0 additions & 5 deletions libs/utils/src/ffi/mod.rs

This file was deleted.

1 change: 0 additions & 1 deletion libs/utils/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pub mod ffi;
pub mod module;
pub mod result;
pub mod sysinfo;
2 changes: 1 addition & 1 deletion modules/console/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = ["Emile Fugulin <code@efugulin.com>"]

[dependencies]
log = { version = "0.4" }
rquickjs = { version = ">=0.10,<0.12", features = ["macro"] }
rquickjs = { version = "0.14", features = ["macro"] }

[dev-dependencies]
rquickjs-extra-test = { path = "../../libs/test" }
4 changes: 2 additions & 2 deletions modules/os/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = ["Emile Fugulin <code@efugulin.com>"]
home = "0.5"
num_cpus = "1"
once_cell = "1"
rquickjs = { version = ">=0.10,<0.12", features = ["macro"] }
rquickjs = { version = "0.14", features = ["macro"] }
rquickjs-extra-utils = { version = "0.2.1", path = "../../libs/utils" }

[target.'cfg(unix)'.dependencies]
Expand All @@ -24,6 +24,6 @@ windows-result = "0.3"
windows-version = "0.1"

[dev-dependencies]
rquickjs = { version = ">=0.10,<0.12", features = ["futures"] }
rquickjs = { version = "0.14", features = ["futures"] }
rquickjs-extra-test = { path = "../../libs/test" }
tokio = { version = "1", features = ["full"] }
Loading
Loading