add missing feature-projections between intra-workspace crates

Signed-off-by: Jason Volk <jason@zemos.net>

Cargo.lock

@@ -784,7 +784,6 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "conduwuit_core",
- "conduwuit_database",
  "conduwuit_service",
  "const-str",
  "futures",

src/admin/Cargo.toml

@@ -17,12 +17,61 @@ crate-type = [
 ]
 
 [features]
+brotli_compression = [
+	"conduwuit-api/brotli_compression",
+	"conduwuit-core/brotli_compression",
+	"conduwuit-service/brotli_compression",
+]
+gzip_compression = [
+	"conduwuit-api/gzip_compression",
+	"conduwuit-core/gzip_compression",
+	"conduwuit-service/gzip_compression",
+]
+io_uring = [
+	"conduwuit-api/io_uring",
+	"conduwuit-database/io_uring",
+	"conduwuit-service/io_uring",
+]
+jemalloc = [
+	"conduwuit-api/jemalloc",
+	"conduwuit-core/jemalloc",
+	"conduwuit-database/jemalloc",
+	"conduwuit-service/jemalloc",
+]
+jemalloc_conf = [
+	"conduwuit-api/jemalloc_conf",
+	"conduwuit-core/jemalloc_conf",
+	"conduwuit-database/jemalloc_conf",
+	"conduwuit-service/jemalloc_conf",
+]
+jemalloc_prof = [
+	"conduwuit-api/jemalloc_prof",
+	"conduwuit-core/jemalloc_prof",
+	"conduwuit-database/jemalloc_prof",
+	"conduwuit-service/jemalloc_prof",
+]
+jemalloc_stats = [
+	"conduwuit-api/jemalloc_stats",
+	"conduwuit-core/jemalloc_stats",
+	"conduwuit-database/jemalloc_stats",
+	"conduwuit-service/jemalloc_stats",
+]
 release_max_log_level = [
+	"conduwuit-api/release_max_log_level",
+	"conduwuit-core/release_max_log_level",
+	"conduwuit-database/release_max_log_level",
+	"conduwuit-service/release_max_log_level",
 	"tracing/max_level_trace",
 	"tracing/release_max_level_info",
 	"log/max_level_trace",
 	"log/release_max_level_info",
 ]
+zstd_compression = [
+	"conduwuit-api/zstd_compression",
+	"conduwuit-core/zstd_compression",
+	"conduwuit-database/zstd_compression",
+	"conduwuit-service/zstd_compression",
+]
 
 [dependencies]
 clap.workspace = true

src/api/Cargo.toml

@@ -17,21 +17,50 @@ crate-type = [
 ]
 
 [features]
-element_hacks = []
+brotli_compression = [
-release_max_log_level = [
+	"conduwuit-core/brotli_compression",
-	"tracing/max_level_trace",
+	"conduwuit-service/brotli_compression",
-	"tracing/release_max_level_info",
+	"reqwest/brotli",
-	"log/max_level_trace",
-	"log/release_max_level_info",
 ]
-zstd_compression = [
+element_hacks = [
-    "reqwest/zstd",
+	"conduwuit-service/element_hacks",
 ]
 gzip_compression = [
+	"conduwuit-core/gzip_compression",
+	"conduwuit-service/gzip_compression",
 	"reqwest/gzip",
 ]
-brotli_compression = [
+io_uring = [
-	"reqwest/brotli",
+	"conduwuit-service/io_uring",
+]
+jemalloc = [
+    "conduwuit-core/jemalloc",
+    "conduwuit-service/jemalloc",
+]
+jemalloc_conf = [
+	"conduwuit-core/jemalloc_conf",
+	"conduwuit-service/jemalloc_conf",
+]
+jemalloc_prof = [
+	"conduwuit-core/jemalloc_prof",
+	"conduwuit-service/jemalloc_prof",
+]
+jemalloc_stats = [
+	"conduwuit-core/jemalloc_stats",
+	"conduwuit-service/jemalloc_stats",
+]
+release_max_log_level = [
+	"conduwuit-core/release_max_log_level",
+	"conduwuit-service/release_max_log_level",
+	"log/max_level_trace",
+	"log/release_max_level_info",
+	"tracing/max_level_trace",
+	"tracing/release_max_level_info",
+]
+zstd_compression = [
+	"conduwuit-core/zstd_compression",
+	"conduwuit-service/zstd_compression",
+	"reqwest/zstd",
 ]
 
 [dependencies]
@@ -42,7 +71,6 @@ axum.workspace = true
 base64.workspace = true
 bytes.workspace = true
 conduwuit-core.workspace = true
-conduwuit-database.workspace = true
 conduwuit-service.workspace = true
 const-str.workspace = true
 futures.workspace = true

src/core/Cargo.toml

@@ -17,17 +17,24 @@ crate-type = [
 ]
 
 [features]
-release_max_log_level = [
+brotli_compression = [
-	"tracing/max_level_trace",
+	"reqwest/brotli",
-	"tracing/release_max_level_info",
+]
-	"log/max_level_trace",
+conduwuit_mods = [
-	"log/release_max_level_info",
+    "dep:libloading"
+]
+gzip_compression = [
+	"reqwest/gzip",
+]
+hardened_malloc = [
+	"dep:hardened_malloc-rs"
 ]
 jemalloc = [
 	"dep:tikv-jemalloc-sys",
 	"dep:tikv-jemalloc-ctl",
 	"dep:tikv-jemallocator",
 ]
+jemalloc_conf = []
 jemalloc_prof = [
 	"tikv-jemalloc-sys/profiling",
 ]
@@ -36,24 +43,17 @@ jemalloc_stats = [
     "tikv-jemalloc-ctl/stats",
     "tikv-jemallocator/stats",
 ]
-jemalloc_conf = []
+perf_measurements = []
-hardened_malloc = [
+release_max_log_level = [
-	"dep:hardened_malloc-rs"
+	"tracing/max_level_trace",
-]
+	"tracing/release_max_level_info",
-gzip_compression = [
+	"log/max_level_trace",
-	"reqwest/gzip",
+	"log/release_max_level_info",
-]
-brotli_compression = [
-	"reqwest/brotli",
 ]
+sentry_telemetry = []
 zstd_compression = [
     "reqwest/zstd",
 ]
-perf_measurements = []
-sentry_telemetry = []
-conduwuit_mods = [
-    "dep:libloading"
-]
 
 [dependencies]
 argon2.workspace = true

src/core/info/cargo.rs

@@ -31,7 +31,7 @@ const ROUTER_MANIFEST: &'static str = ();
 #[cargo_manifest(crate = "main")]
 const MAIN_MANIFEST: &'static str = ();
 
-/// Processed list of features access all project crates. This is generated from
+/// Processed list of features across all project crates. This is generated from
 /// the data in the MANIFEST strings and contains all possible project features.
 /// For *enabled* features see the info::rustc module instead.
 static FEATURES: OnceLock<Vec<String>> = OnceLock::new();

src/database/Cargo.toml

@@ -17,19 +17,31 @@ crate-type = [
 ]
 
 [features]
-release_max_log_level = [
-	"tracing/max_level_trace",
-	"tracing/release_max_level_info",
-	"log/max_level_trace",
-	"log/release_max_level_info",
-]
-jemalloc = [
-	"rust-rocksdb/jemalloc",
-]
 io_uring = [
 	"rust-rocksdb/io-uring",
 ]
+jemalloc = [
+	"conduwuit-core/jemalloc",
+	"rust-rocksdb/jemalloc",
+]
+jemalloc_conf = [
+	"conduwuit-core/jemalloc_conf",
+]
+jemalloc_prof = [
+	"conduwuit-core/jemalloc_prof",
+]
+jemalloc_stats = [
+	"conduwuit-core/jemalloc_stats",
+]
+release_max_log_level = [
+	"conduwuit-core/release_max_log_level",
+	"log/max_level_trace",
+	"log/release_max_level_info",
+	"tracing/max_level_trace",
+	"tracing/release_max_level_info",
+]
 zstd_compression = [
+	"conduwuit-core/zstd_compression",
 	"rust-rocksdb/zstd",
 ]
 

src/main/Cargo.toml

@@ -70,6 +70,7 @@ element_hacks = [
 ]
 gzip_compression = [
 	"conduwuit-api/gzip_compression",
+	"conduwuit-core/gzip_compression",
 	"conduwuit-router/gzip_compression",
 	"conduwuit-service/gzip_compression",
 ]
@@ -141,6 +142,7 @@ zstd_compression = [
 	"conduwuit-core/zstd_compression",
 	"conduwuit-database/zstd_compression",
 	"conduwuit-router/zstd_compression",
+	"conduwuit-service/zstd_compression",
 ]
 conduwuit_mods = [
     "conduwuit-core/conduwuit_mods",

src/router/Cargo.toml

@@ -17,34 +17,79 @@ crate-type = [
 ]
 
 [features]
+brotli_compression = [
+	"conduwuit-admin/brotli_compression",
+	"conduwuit-api/brotli_compression",
+	"conduwuit-core/brotli_compression",
+	"conduwuit-service/brotli_compression",
+	"tower-http/compression-br",
+]
+direct_tls = [
+	"axum-server/tls-rustls",
+	"dep:rustls",
+	"dep:axum-server-dual-protocol",
+]
+gzip_compression = [
+	"conduwuit-admin/gzip_compression",
+	"conduwuit-api/gzip_compression",
+	"conduwuit-core/gzip_compression",
+	"conduwuit-service/gzip_compression",
+	"tower-http/compression-gzip",
+]
+io_uring = [
+	"conduwuit-admin/io_uring",
+	"conduwuit-api/io_uring",
+	"conduwuit-service/io_uring",
+	"conduwuit-api/io_uring",
+]
+jemalloc = [
+	"conduwuit-admin/jemalloc",
+	"conduwuit-api/jemalloc",
+	"conduwuit-core/jemalloc",
+	"conduwuit-service/jemalloc",
+]
+jemalloc_conf = [
+	"conduwuit-admin/jemalloc_conf",
+	"conduwuit-api/jemalloc_conf",
+	"conduwuit-core/jemalloc_conf",
+	"conduwuit-service/jemalloc_conf",
+]
+jemalloc_prof = [
+	"conduwuit-admin/jemalloc_prof",
+	"conduwuit-api/jemalloc_prof",
+	"conduwuit-core/jemalloc_prof",
+	"conduwuit-service/jemalloc_prof",
+]
+jemalloc_stats = [
+	"conduwuit-admin/jemalloc_stats",
+	"conduwuit-api/jemalloc_stats",
+	"conduwuit-core/jemalloc_stats",
+	"conduwuit-service/jemalloc_stats",
+]
 release_max_log_level = [
+	"conduwuit-admin/release_max_log_level",
+	"conduwuit-api/release_max_log_level",
+	"conduwuit-core/release_max_log_level",
+	"conduwuit-service/release_max_log_level",
 	"tracing/max_level_trace",
 	"tracing/release_max_level_info",
 	"log/max_level_trace",
 	"log/release_max_level_info",
 ]
 sentry_telemetry = [
+	"conduwuit-core/sentry_telemetry",
 	"dep:sentry",
 	"dep:sentry-tracing",
 	"dep:sentry-tower",
 ]
-zstd_compression = [
-	"tower-http/compression-zstd",
-]
-gzip_compression = [
-	"tower-http/compression-gzip",
-]
-brotli_compression = [
-	"tower-http/compression-br",
-]
 systemd = [
 	"dep:sd-notify",
 ]
-
+zstd_compression = [
-direct_tls = [
+	"conduwuit-api/zstd_compression",
-    "axum-server/tls-rustls",
+	"conduwuit-core/zstd_compression",
-    "dep:rustls",
+	"conduwuit-service/zstd_compression",
-    "dep:axum-server-dual-protocol",
+	"tower-http/compression-zstd",
 ]
 
 [dependencies]

src/service/Cargo.toml

@@ -17,7 +17,12 @@ crate-type = [
 ]
 
 [features]
+blurhashing = [
+	"dep:image",
+	"dep:blurhash",
+]
 brotli_compression = [
+	"conduwuit-core/brotli_compression",
 	"reqwest/brotli",
 ]
 console = [
@@ -26,25 +31,48 @@ console = [
 ]
 element_hacks = []
 gzip_compression = [
+	"conduwuit-core/gzip_compression",
 	"reqwest/gzip",
 ]
+io_uring = [
+	"conduwuit-database/io_uring",
+]
+jemalloc = [
+	"conduwuit-core/jemalloc",
+	"conduwuit-database/jemalloc",
+]
+jemalloc_conf = [
+	"conduwuit-core/jemalloc_conf",
+	"conduwuit-database/jemalloc_conf",
+]
+jemalloc_prof = [
+	"conduwuit-core/jemalloc_prof",
+	"conduwuit-database/jemalloc_prof",
+]
+jemalloc_stats = [
+	"conduwuit-core/jemalloc_stats",
+	"conduwuit-database/jemalloc_stats",
+]
 media_thumbnail = [
 	"dep:image",
 ]
 release_max_log_level = [
-	"tracing/max_level_trace",
+	"conduwuit-core/release_max_log_level",
-	"tracing/release_max_level_info",
+	"conduwuit-database/release_max_log_level",
 	"log/max_level_trace",
 	"log/release_max_level_info",
+	"tracing/max_level_trace",
+	"tracing/release_max_level_info",
 ]
 url_preview = [
 	"dep:image",
 	"dep:webpage",
 ]
 zstd_compression = [
+	"conduwuit-core/zstd_compression",
+	"conduwuit-database/zstd_compression",
     "reqwest/zstd",
 ]
-blurhashing = ["dep:image","dep:blurhash"]
 
 [dependencies]
 async-trait.workspace = true