Merge pull request #265 from boozook/sim-ctrl-async-std

Improve sim ctrl: async-std support

cargo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-playdate"
-version = "0.4.0-alpha.2"
+version = "0.4.0-alpha.3"
 readme = "README.md"
 description = "Build tool for neat yellow console."
 keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"]
@@ -66,6 +66,7 @@ features = ["clap", "tokio", "async-std", "tokio-serial"]
 
 [dependencies.simulator]
 workspace = true
+features = ["async-std"]
 
 [dependencies.clap]
 workspace = true
@@ -92,7 +93,3 @@ rand = "0.8"
 
 [target.'cfg(unix)'.dev-dependencies]
 nix = { version = "0.28", features = ["signal"] }
-
-
-[features]
-default = []

support/sim-ctrl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "playdate-simulator-utils"
-version = "0.1.0"
+version = "0.1.1"
 readme = "README.md"
 description = "Cross-platform utils to deal with Playdate Simulator."
 keywords = ["playdate", "sdk", "utils"]
@@ -26,3 +26,12 @@ features = ["process"]
 default-features = false
 workspace = true
 optional = true
+
+[dependencies.async-std]
+features = ["futures-lite", "unstable", "default"]
+workspace = true
+optional = true
+
+
+[features]
+tokio = ["dep:tokio", "async-std?/tokio1"]

support/sim-ctrl/src/run.rs

@@ -6,16 +6,21 @@ use utils::toolchain::sdk::Sdk;
 
 #[cfg_attr(feature = "tracing", tracing::instrument)]
 pub async fn run(pdx: &Path, sdk: Option<&Path>) -> Result<(), Error> {
+	#[cfg(all(feature = "tokio", not(feature = "async-std")))]
+	use tokio::process::Command;
+	#[cfg(feature = "async-std")]
+	use async_std::process::Command;
+
 	#[allow(unused_mut)]
 	let mut cmd = command(&pdx, sdk.as_deref())?;
-	#[cfg(feature = "tokio")]
-	let mut cmd = tokio::process::Command::from(cmd);
+	#[cfg(any(feature = "tokio", feature = "async-std"))]
+	let mut cmd = Command::from(cmd);
 
 	trace!("executing: {cmd:?}");
 
-	#[cfg(feature = "tokio")]
+	#[cfg(any(feature = "tokio", feature = "async-std"))]
 	cmd.status().await?.exit_ok()?;
-	#[cfg(not(feature = "tokio"))]
+	#[cfg(all(not(feature = "tokio"), not(feature = "async-std")))]
 	cmd.status()?.exit_ok()?;
 
 	Ok(())