Merge pull request #128 from boozook/upd-deps

Update deps, also little fix for better linking and soundness for sys entry-point
boozook · Sep 26, 2023 · 3d42b2c · 3d42b2c
2 parents ae7b51d + b656d87
commit 3d42b2c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,4 +46,4 @@ env_logger = "0.10"
 clap = "4.3"
 serde = "1.0"
 serde_json = "1.0"
-toml = "0.7"
+toml = "0.8"
diff --git a/api/sys/Cargo.toml b/api/sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-sys"
-version = "0.1.11"
+version = "0.1.12"
 build = "src/build.rs"
 readme = "README.md"
 description = "Low-level Playdate API bindings"

diff --git a/api/sys/src/lib.rs b/api/sys/src/lib.rs
@@ -68,12 +68,12 @@ pub extern "C" fn eventHandlerShim(api: *const ffi::PlaydateAPI,
                                    arg: u32)
                                    -> core::ffi::c_int {
 	extern "Rust" {
-		fn event_handler(api: *const ffi::PlaydateAPI, event: ffi::PDSystemEvent, arg: u32) -> core::ffi::c_int;
+		fn event_handler(api: *const ffi::PlaydateAPI, event: ffi::PDSystemEvent, arg: u32) -> bool;
 	}
 	if let ffi::PDSystemEvent::kEventInit = event {
 		unsafe { API = api }
 	}
-	unsafe { event_handler(api, event, arg) }
+	unsafe { event_handler(api, event, arg) }.into()
 }
 
 

diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-playdate"
-version = "0.3.2"
+version = "0.3.3"
 readme = "README.md"
 description = "Build tool for neat yellow console."
 keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"]
@@ -39,14 +39,14 @@ semver.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 toml.workspace = true
-toml_edit = { version = "0.19", features = ["serde"] }
+toml_edit = { version = "0.20", features = ["serde"] }
 regex.workspace = true
 byteorder = "1.4"
 zip = { version = "0.6.6", features = ["time"] }
-walkdir = "2.3"
+walkdir = "2.4"
 
 anyhow = "1.0"
-termcolor = "1.2"
+termcolor = "1.3"
 
 env_logger.workspace = true
 log.workspace = true