Skip to content

Commit d3dd26f

Browse files
committed
Update rquikjs to latest
1 parent 07c95ac commit d3dd26f

File tree

14 files changed

+23
-30
lines changed

14 files changed

+23
-30
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
toolchain: ${{ inputs.toolchain }}
3030
- name: Run tests
3131
run: |
32-
cargo test
32+
cargo test --all

libs/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ readme = "README.md"
99

1010
[dependencies]
1111
futures = { version = "0.3" }
12-
rquickjs = { version = "0.6", features = ["macro", "futures"] }
12+
rquickjs = { version = "0.9", features = ["macro", "futures"] }
1313
tokio = { version = "1", features = ["full"] }

libs/utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ repository = "https://github.com/rquickjs/rquickjs-extra"
88
readme = "README.md"
99

1010
[dependencies]
11-
rquickjs = { version = "0.6", features = ["array-buffer"] }
11+
rquickjs = { version = "0.9", features = ["array-buffer"] }

libs/utils/src/ffi/c_string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<'js> CString<'js> {
5353
}
5454
}
5555

56-
impl<'js> Drop for CString<'js> {
56+
impl Drop for CString<'_> {
5757
fn drop(&mut self) {
5858
unsafe { qjs::JS_FreeCString(self.value.ctx().as_raw().as_ptr(), self.ptr) };
5959
}

modules/console/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ readme = "README.md"
99

1010
[dependencies]
1111
log = { version = "0.4" }
12-
rquickjs = { version = "0.6", features = ["macro"] }
12+
rquickjs = { version = "0.9", features = ["macro"] }
1313

1414
[dev-dependencies]
1515
rquickjs-extra-test = { path = "../../libs/test" }

modules/console/src/lib.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
use std::fmt::Write;
22

3-
use rquickjs::{
4-
class::{Class, Trace},
5-
function::Rest,
6-
Ctx, Error, Result, Value,
7-
};
3+
use rquickjs::{class::Trace, function::Rest, Ctx, Error, JsLifetime, Result, Value};
84

95
pub use self::formatter::Formatter;
106

@@ -17,7 +13,7 @@ const TARGET: &str = "console";
1713
/// # Example
1814
/// ```rust
1915
/// use rquickjs::{Context, Runtime};
20-
/// use rquickjs_extra::console::{Console, Formatter};
16+
/// use rquickjs_extra_console::{Console, Formatter};
2117
///
2218
/// fn main() {
2319
/// let rt = Runtime::new().unwrap();
@@ -32,7 +28,7 @@ const TARGET: &str = "console";
3228
/// ```
3329
///
3430
/// [`log`]: https://docs.rs/log
35-
#[derive(Clone, Trace)]
31+
#[derive(Clone, Trace, JsLifetime)]
3632
#[rquickjs::class(frozen)]
3733
pub struct Console {
3834
target: String,
@@ -82,8 +78,6 @@ impl Console {
8278
pub fn init(ctx: &Ctx<'_>) -> Result<()> {
8379
let globals = ctx.globals();
8480

85-
Class::<Console>::register(ctx)?;
86-
8781
globals.set(
8882
"console",
8983
Console::new(TARGET, Formatter::builder().max_depth(3).build()),

modules/os/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ readme = "README.md"
1111
home = "0.5"
1212
num_cpus = "1"
1313
once_cell = "1"
14-
rquickjs = { version = "0.6", features = ["macro"] }
14+
rquickjs = { version = "0.9", features = ["macro"] }
1515
rquickjs-extra-utils = { path = "../../libs/utils" }
1616

1717
[target.'cfg(unix)'.dependencies]
@@ -23,6 +23,6 @@ windows-result = "0.2"
2323
windows-version = "0.1"
2424

2525
[dev-dependencies]
26-
rquickjs = { version = "0.6", features = ["futures"] }
26+
rquickjs = { version = "0.9", features = ["futures"] }
2727
rquickjs-extra-test = { path = "../../libs/test" }
2828
tokio = { version = "1", features = ["full"] }

modules/sqlite/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ readme = "README.md"
99

1010
[dependencies]
1111
either = { version = "1" }
12-
rquickjs = { version = "0.6", features = [
12+
rquickjs = { version = "0.9", features = [
1313
"array-buffer",
1414
"either",
1515
"macro",
1616
"futures",
1717
] }
1818
rquickjs-extra-utils = { path = "../../libs/utils" }
19-
sqlx = { version = "0.8.2", default-features = false, features = [
19+
sqlx = { version = "0.8", default-features = false, features = [
2020
"sqlite",
2121
"runtime-tokio",
2222
] }

modules/sqlite/src/database.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use rquickjs::{Ctx, Result};
1+
use rquickjs::{class::Trace, Ctx, JsLifetime, Result};
22
use rquickjs_extra_utils::result::ResultExt;
33
use sqlx::{Executor, SqlitePool};
44

55
use super::Statement;
66

7+
#[derive(Trace, JsLifetime)]
78
#[rquickjs::class]
8-
#[derive(rquickjs::class::Trace)]
99
pub struct Database {
1010
#[qjs(skip_trace)]
1111
pool: SqlitePool,

modules/sqlite/src/statement.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rquickjs::function::Rest;
2-
use rquickjs::{Ctx, Object, Result};
2+
use rquickjs::{class::Trace, Ctx, JsLifetime, Object, Result};
33
use rquickjs_extra_utils::result::ResultExt;
44
use sqlx::query::Query;
55
use sqlx::sqlite::SqliteArguments;
@@ -8,8 +8,8 @@ use sqlx::{sqlite::SqliteStatement, Column as _, Row as _, SqlitePool, Statement
88

99
use super::{Argument, Value};
1010

11+
#[derive(Trace, JsLifetime)]
1112
#[rquickjs::class]
12-
#[derive(rquickjs::class::Trace)]
1313
pub struct Statement {
1414
#[qjs(skip_trace)]
1515
stmt: SqliteStatement<'static>,

0 commit comments

Comments
 (0)