consolidate default cargo features

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

Cargo.lock

@@ -572,8 +572,12 @@ name = "conduit"
 version = "0.4.1"
 dependencies = [
  "clap",
+ "conduit_admin",
+ "conduit_api",
  "conduit_core",
+ "conduit_database",
  "conduit_router",
+ "conduit_service",
  "console-subscriber",
  "hardened_malloc-rs",
  "log",
@@ -761,18 +765,15 @@ dependencies = [
  "log",
  "loole",
  "lru-cache",
- "parking_lot",
  "rand",
  "regex",
  "reqwest",
  "ruma",
  "ruma-identifiers-validation",
- "rusqlite",
  "serde",
  "serde_json",
  "serde_yaml",
  "sha2",
- "thread_local",
  "tokio",
  "tracing",
  "url",

src/admin/Cargo.toml

@@ -17,14 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"zstd_compression",
-	"release_max_log_level",
-]
-
 dev_release_log_level = []
 release_max_log_level = [
 	"tracing/max_level_trace",

src/api/Cargo.toml

@@ -17,13 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"element_hacks",
-	"gzip_compression",
-	"brotli_compression",
-	"release_max_log_level",
-]
-
 element_hacks = []
 dev_release_log_level = []
 release_max_log_level = [

src/core/Cargo.toml

@@ -17,17 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"gzip_compression",
-	"zstd_compression",
-	"brotli_compression",
-	"sentry_telemetry",
-	"release_max_log_level",
-]
-
 dev_release_log_level = []
 release_max_log_level = [
 	"tracing/max_level_trace",

src/database/Cargo.toml

@@ -17,14 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"zstd_compression",
-	"release_max_log_level",
-]
-
 dev_release_log_level = []
 release_max_log_level = [
 	"tracing/max_level_trace",

src/main/Cargo.toml

@@ -37,27 +37,57 @@ assets = [
 
 [features]
 default = [
-	"sentry_telemetry",
+	"brotli_compression",
+	"element_hacks",
+	"gzip_compression",
+	"io_uring",
+	"jemalloc",
 	"release_max_log_level",
+	"rocksdb",
+	"sentry_telemetry",
+	"systemd",
+	"zstd_compression",
 ]
 
-# increases performance, reduces build times, and reduces binary size by not compiling or
+axum_dual_protocol = [
-# genreating code for log level filters that users will generally not use (debug and trace)
+	"conduit-router/axum_dual_protocol",
-release_max_log_level = [
-	"tracing/max_level_trace",
-	"tracing/release_max_level_info",
-	"log/max_level_trace",
-	"log/release_max_level_info",
 ]
-sentry_telemetry = [
+brotli_compression = [
-	"dep:sentry",
+	"conduit-api/brotli_compression",
-	"dep:sentry-tracing",
+	"conduit-core/brotli_compression",
-	"dep:sentry-tower",
+	"conduit-router/brotli_compression",
+	"conduit-service/brotli_compression",
 ]
-# enable the tokio_console server ncompatible with release_max_log_level
+dev_release_log_level = [
-tokio_console = [
+	"conduit-api/dev_release_log_level",
-	"dep:console-subscriber",
+	"conduit-core/dev_release_log_level",
-	"tokio/tracing",
+	"conduit-database/dev_release_log_level",
+	"conduit-router/dev_release_log_level",
+	"conduit-service/dev_release_log_level",
+]
+element_hacks = [
+	"conduit-api/element_hacks",
+]
+gzip_compression = [
+	"conduit-api/gzip_compression",
+	"conduit-router/gzip_compression",
+	"conduit-service/gzip_compression",
+]
+hardened_malloc = [
+	"conduit-core/hardened_malloc",
+]
+io_uring = [
+	"conduit-admin/io_uring",
+	"conduit-core/io_uring",
+	"conduit-database/io_uring",
+]
+jemalloc = [
+	"conduit-admin/jemalloc",
+	"conduit-core/jemalloc",
+	"conduit-database/jemalloc",	
+]
+jemalloc_prof = [
+	"conduit-core/jemalloc_prof",
 ]
 perf_measurements = [
 	"dep:opentelemetry",
@@ -65,11 +95,64 @@ perf_measurements = [
 	"dep:tracing-opentelemetry",
 	"dep:opentelemetry_sdk",
 	"dep:opentelemetry-jaeger",
+	"conduit-core/perf_measurements",
+	"conduit-core/sentry_telemetry",
+]
+# increases performance, reduces build times, and reduces binary size by not compiling or
+# genreating code for log level filters that users will generally not use (debug and trace)
+release_max_log_level = [
+	"tracing/max_level_trace",
+	"tracing/release_max_level_info",
+	"log/max_level_trace",
+	"log/release_max_level_info",
+	"conduit-admin/release_max_log_level",
+	"conduit-api/release_max_log_level",
+	"conduit-core/release_max_log_level",
+	"conduit-database/release_max_log_level",
+	"conduit-router/release_max_log_level",
+	"conduit-service/release_max_log_level",
+]
+rocksdb = [
+	"conduit-admin/rocksdb",
+	"conduit-core/rocksdb",
+	"conduit-database/rocksdb",
+]
+sentry_telemetry = [
+	"dep:sentry",
+	"dep:sentry-tracing",
+	"dep:sentry-tower",
+	"conduit-core/sentry_telemetry",
+	"conduit-router/sentry_telemetry",
+]
+sha256_media = [
+	"conduit-service/sha256_media",
+]
+sqlite = [
+	"conduit-core/sqlite",
+	"conduit-database/sqlite",
+]
+systemd = [
+	"conduit-router/systemd",
+]
+# enable the tokio_console server ncompatible with release_max_log_level
+tokio_console = [
+	"dep:console-subscriber",
+	"tokio/tracing",
+]
+zstd_compression = [
+	"conduit-admin/zstd_compression",
+	"conduit-core/zstd_compression",
+	"conduit-database/zstd_compression",
+	"conduit-router/zstd_compression",
 ]
 
 [dependencies]
-conduit-router.workspace = true
+conduit-admin.workspace = true
+conduit-api.workspace = true
 conduit-core.workspace = true
+conduit-database.workspace = true
+conduit-router.workspace = true
+conduit-service.workspace = true
 
 tokio.workspace = true
 log.workspace = true

src/router/Cargo.toml

@@ -17,15 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"systemd",
-	"sentry_telemetry",
-	"gzip_compression",
-	"zstd_compression",
-	"brotli_compression",
-	"release_max_log_level",
-]
-
 dev_release_log_level = []
 release_max_log_level = [
 	"tracing/max_level_trace",

src/service/Cargo.toml

@@ -17,12 +17,6 @@ crate-type = [
 ]
 
 [features]
-default = [
-	"gzip_compression",
-	"brotli_compression",
-	"release_max_log_level",
-]
-
 dev_release_log_level = []
 release_max_log_level = [
 	"tracing/max_level_trace",
@@ -30,11 +24,6 @@ release_max_log_level = [
 	"log/max_level_trace",
 	"log/release_max_level_info",
 ]
-sqlite = [
-	"dep:rusqlite",
-	"dep:parking_lot",
-	"dep:thread_local",
-]
 gzip_compression = [
 	"reqwest/gzip",
 ]
@@ -63,22 +52,16 @@ jsonwebtoken.workspace = true
 log.workspace = true
 loole.workspace = true
 lru-cache.workspace = true
-parking_lot.optional = true
-parking_lot.workspace = true
 rand.workspace = true
 regex.workspace = true
 reqwest.workspace = true
 ruma-identifiers-validation.workspace = true
 ruma.workspace = true
-rusqlite.optional = true
-rusqlite.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 serde_yaml.workspace = true
 sha2.optional = true
 sha2.workspace = true
-thread_local.optional = true
-thread_local.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 url.workspace = true