bug fix: make sure that distributed feature is actually being triggered

also make sure that actix-web is available when needed
DominicBurkart · Sep 30, 2020 · 0682c58 · 0682c58
1 parent 6229f02
commit 0682c58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,8 +8,8 @@ readme = "README.md"
 license = "Hippocratic-2.1"
 
 [features]
-distributed = ["chrono", "cached", "async-std"]
-service = ["actix-web", "serde_json"]
+distributed = ["chrono", "cached", "async-std", "turbolift_macros/distributed"]
+service = ["serde_json"]
 # todo we can optimize reqs for children with this load
 
 [dependencies]
@@ -18,5 +18,5 @@ turbolift_internals = { path = "./turbolift_internals" }
 async-std = { version = "1.6", optional = true }
 chrono = { version = "0.4", optional = true }
 cached = { version = "0.19", optional = true }
-actix-web = { version = "3", optional = true }
+actix-web = { version = "3" }
 serde_json = { version = "1", optional = true }
diff --git a/src/lib.rs b/src/lib.rs
@@ -5,7 +5,6 @@ pub use cached;
 #[cfg(feature = "distributed")]
 pub use chrono;
 
-#[cfg(feature = "service")]
 pub use actix_web;
 #[cfg(feature = "service")]
 pub use serde_json;

diff --git a/turbolift_macros/Cargo.toml b/turbolift_macros/Cargo.toml
@@ -9,6 +9,9 @@ edition = "2018"
 [lib]
 proc-macro = true
 
+[features]
+"distributed" = []
+
 [dependencies]
 quote = "1"
 proc-macro2 = "1"