feat(deps): removed default std feature and updated to target_family

Signed-off-by: luk3ark <[email protected]>
wasmCloud · Jan 2, 2025 · 11aa88b · 11aa88b
1 parent 6b768c1
commit 11aa88b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/crates/wadm-types/Cargo.toml b/crates/wadm-types/Cargo.toml
@@ -9,8 +9,6 @@ license = "Apache-2.0"
 repository = "https://github.com/wasmcloud/wadm"
 
 [features]
-default = ["std"]
-std = ["dep:tokio"]
 wit = []
 
 [dependencies]
@@ -22,10 +20,9 @@ regex = { workspace = true }
 schemars = { workspace = true }
 utoipa = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { workspace = true, optional = true, features = ["full"] }
-wit-bindgen-wrpc = { workspace = true, optional = true }
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+tokio = { workspace = true, features = ["full"] }
+wit-bindgen-wrpc = { workspace = true }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-tokio = { workspace = true, optional = true }
-wit-bindgen = { workspace = true, optional = true, features = ["macros"] }
+[target.'cfg(target_family = "wasm")'.dependencies]
+wit-bindgen = { workspace = true, features = ["macros"] }
diff --git a/crates/wadm-types/src/bindings.rs b/crates/wadm-types/src/bindings.rs
@@ -10,8 +10,7 @@ use crate::{
 };
 use wasmcloud::wadm;
 
-#[cfg(feature = "wit")]
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(feature = "wit", target_family = "wasm"))]
 wit_bindgen::generate!({
     path: "wit",
     additional_derives: [
@@ -25,8 +24,7 @@ wit_bindgen::generate!({
     }
 });
 
-#[cfg(feature = "wit")]
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(all(feature = "wit", not(target_family = "wasm")))]
 wit_bindgen_wrpc::generate!({
     generate_unused_types: true,
     additional_derives: [

diff --git a/crates/wadm-types/src/validation.rs b/crates/wadm-types/src/validation.rs
@@ -2,7 +2,7 @@
 //!
 
 use std::collections::{HashMap, HashSet};
-#[cfg(feature = "std")]
+#[cfg(not(target_family = "wasm"))]
 use std::path::Path;
 use std::sync::OnceLock;
 
@@ -274,7 +274,7 @@ impl ValidationOutput for Vec<ValidationFailure> {
 /// # Arguments
 ///
 /// * `path` - Path to the Manifest that will be read into memory and validated
-#[cfg(feature = "std")]
+#[cfg(not(target_family = "wasm"))]
 pub async fn validate_manifest_file(
     path: impl AsRef<Path>,
 ) -> Result<(Manifest, Vec<ValidationFailure>)> {