fix_features

epompeii · epompeii · commit 6e6215a69dae · 2025-02-27T22:10:58.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/api_auth/Cargo.toml b/lib/api_auth/Cargo.toml
@@ -16,7 +16,6 @@ sentry = ["bencher_schema/sentry"]
 
 [dependencies]
 bencher_endpoint.workspace = true
-bencher_billing = { workspace = true, optional = true }
 bencher_json = { workspace = true, features = ["server", "schema", "db"] }
 bencher_schema.workspace = true
 dropshot.workspace = true
diff --git a/lib/api_checkout/Cargo.toml b/lib/api_checkout/Cargo.toml
@@ -12,11 +12,10 @@ plus = [
     "bencher_json/plus",
     "bencher_schema/plus",
 ]
-sentry = ["bencher_schema/sentry", "dep:sentry"]
+sentry = ["dep:sentry", "bencher_schema/sentry"]
 
 [dependencies]
 bencher_endpoint.workspace = true
-bencher_billing = { workspace = true, optional = true }
 bencher_json = { workspace = true, features = ["server", "schema"] }
 bencher_rbac.workspace = true
 bencher_schema.workspace = true
diff --git a/lib/api_organizations/Cargo.toml b/lib/api_organizations/Cargo.toml
@@ -8,12 +8,12 @@ publish = false
 
 [features]
 plus = [
+    "dep:bencher_billing",
     "bencher_endpoint/plus",
     "bencher_json/plus",
     "bencher_schema/plus",
-    "dep:bencher_billing",
 ]
-sentry = ["bencher_schema/sentry", "dep:sentry"]
+sentry = ["dep:sentry", "bencher_schema/sentry"]
 
 [dependencies]
 bencher_endpoint.workspace = true
diff --git a/lib/api_projects/Cargo.toml b/lib/api_projects/Cargo.toml
@@ -12,7 +12,7 @@ plus = [
     "bencher_json/plus",
     "bencher_schema/plus",
 ]
-sentry = ["bencher_schema/sentry", "dep:sentry"]
+sentry = ["dep:sentry", "bencher_schema/sentry"]
 
 [dependencies]
 bencher_endpoint.workspace = true
diff --git a/lib/api_projects/src/projects.rs b/lib/api_projects/src/projects.rs
@@ -251,6 +251,7 @@ pub async fn project_patch(
     let auth_user = AuthUser::from_token(rqctx.context(), bearer_token).await?;
     let context = rqctx.context();
     let json = patch_inner(
+        #[cfg(feature = "plus")]
         &rqctx.log,
         context,
         path_params.into_inner(),
@@ -262,7 +263,7 @@ pub async fn project_patch(
 }
 
 async fn patch_inner(
-    log: &Logger,
+    #[cfg(feature = "plus")] log: &Logger,
     context: &ApiContext,
     path_params: ProjectParams,
     json_project: JsonUpdateProject,
@@ -331,6 +332,7 @@ pub async fn project_delete(
 ) -> Result<ResponseDeleted, HttpError> {
     let auth_user = AuthUser::from_token(rqctx.context(), bearer_token).await?;
     delete_inner(
+        #[cfg(feature = "plus")]
         &rqctx.log,
         rqctx.context(),
         path_params.into_inner(),
@@ -341,7 +343,7 @@ pub async fn project_delete(
 }
 
 async fn delete_inner(
-    log: &Logger,
+    #[cfg(feature = "plus")] log: &Logger,
     context: &ApiContext,
     path_params: ProjectParams,
     auth_user: &AuthUser,
diff --git a/lib/api_server/Cargo.toml b/lib/api_server/Cargo.toml
@@ -18,7 +18,6 @@ sentry = ["bencher_config/sentry", "bencher_schema/sentry"]
 [dependencies]
 async-compression = { workspace = true, features = ["tokio", "gzip"] }
 bencher_endpoint.workspace = true
-bencher_billing = { workspace = true, optional = true }
 bencher_config.workspace = true
 bencher_json = { workspace = true, features = ["server", "schema", "db"] }
 bencher_schema.workspace = true
diff --git a/lib/api_users/Cargo.toml b/lib/api_users/Cargo.toml
@@ -16,7 +16,6 @@ sentry = ["bencher_schema/sentry"]
 
 [dependencies]
 bencher_endpoint.workspace = true
-bencher_billing = { workspace = true, optional = true }
 bencher_json = { workspace = true, features = ["server", "schema", "db"] }
 bencher_schema.workspace = true
 diesel.workspace = true
diff --git a/lib/bencher_config/Cargo.toml b/lib/bencher_config/Cargo.toml
@@ -8,12 +8,12 @@ publish = false
 
 [features]
 plus = [
-    "bencher_endpoint/plus",
-    "bencher_json/plus",
-    "bencher_schema/plus",
     "dep:bencher_billing",
     "dep:bencher_github",
     "dep:bencher_license",
+    "bencher_endpoint/plus",
+    "bencher_json/plus",
+    "bencher_schema/plus",
 ]
 sentry = ["bencher_schema/sentry"]
 
diff --git a/lib/bencher_config/src/config_tx.rs b/lib/bencher_config/src/config_tx.rs
@@ -15,7 +15,9 @@ use bencher_schema::context::{ApiContext, Database, DbConnection};
 #[cfg(feature = "plus")]
 use bencher_schema::model::server::QueryServer;
 use bencher_token::TokenKey;
-use diesel::{connection::SimpleConnection, Connection};
+#[cfg(feature = "plus")]
+use diesel::connection::SimpleConnection;
+use diesel::Connection;
 use dropshot::{
     ApiDescription, ConfigDropshot, ConfigLogging, ConfigLoggingIfExists, ConfigLoggingLevel,
     ConfigTls, HttpServer,
diff --git a/lib/bencher_endpoint/Cargo.toml b/lib/bencher_endpoint/Cargo.toml
@@ -7,9 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
-plus = [
-    "bencher_schema/plus",
-]
+plus = ["bencher_schema/plus"]
 
 [dependencies]
 bencher_schema.workspace = true
diff --git a/lib/bencher_json/Cargo.toml b/lib/bencher_json/Cargo.toml
@@ -11,7 +11,7 @@ client = ["bencher_context/client", "bencher_valid/client"]
 table = ["dep:tabled"]
 server = ["bencher_valid/server"]
 schema = ["dep:schemars", "bencher_context/schema", "ordered-float/schemars"]
-db = ["diesel", "serde_yaml", "bencher_valid/db"]
+db = ["dep:diesel", "dep:serde_yaml", "bencher_valid/db"]
 plus = ["bencher_valid/plus"]
 
 [dependencies]
diff --git a/lib/bencher_plot/Cargo.toml b/lib/bencher_plot/Cargo.toml
@@ -6,13 +6,8 @@ edition.workspace = true
 license-file.workspace = true
 publish = false
 
-[features]
-default = ["server"]
-client = ["bencher_json/client"]
-server = ["bencher_json/server"]
-
 [dependencies]
-bencher_json.workspace = true
+bencher_json = {workspace = true, features = ["server"] }
 chrono.workspace = true
 ordered-float.workspace = true
 thiserror.workspace = true
diff --git a/lib/bencher_schema/Cargo.toml b/lib/bencher_schema/Cargo.toml
@@ -8,13 +8,14 @@ publish = false
 
 [features]
 plus = [
-    "bencher_json/plus",
     "dep:bencher_billing",
     "dep:bencher_bing_index",
     "dep:bencher_github",
     "dep:bencher_google_index",
     "dep:bencher_license",
     "dep:reqwest",
+    "dep:serde_json",
+    "bencher_json/plus",
 ]
 sentry = ["dep:sentry"]
 
@@ -37,7 +38,7 @@ derive_more.workspace = true
 diesel = { workspace = true, features = ["chrono", "sqlite"] }
 dropshot.workspace = true
 http.workspace = true
-serde_json.workspace = true
+serde_json = {workspace = true, optional = true}
 serde_urlencoded.workspace = true
 oso.workspace = true
 reqwest = { workspace = true, optional = true, features = ["rustls-tls"] }
diff --git a/lib/bencher_valid/Cargo.toml b/lib/bencher_valid/Cargo.toml
@@ -12,15 +12,15 @@ crate-type = ["cdylib", "rlib"]
 [features]
 client = ["dep:regex-lite"]
 server = ["dep:rand", "dep:regex"]
+schema = ["dep:schemars", "ordered-float/schemars"]
 db = ["dep:diesel"]
 plus = ["chrono/clock"]
-schema = ["dep:schemars", "ordered-float/schemars"]
 wasm = [
+    "client",
     "dep:console_error_panic_hook",
     "dep:wasm-bindgen",
     "dep:serde_json",
     "chrono/wasmbind",
-    "client",
 ]
 
 [dependencies]
diff --git a/services/api/Cargo.toml b/services/api/Cargo.toml
@@ -22,6 +22,7 @@ plus = [
     "bencher_schema/plus",
 ]
 sentry = [
+    "dep:sentry",
     "api_auth/sentry",
     "api_checkout/sentry",
     "api_organizations/sentry",
@@ -31,7 +32,6 @@ sentry = [
     "api_users/sentry",
     "bencher_config/sentry",
     "bencher_schema/sentry",
-    "dep:sentry"
 ]
 
 [dependencies]
diff --git a/services/api/src/api.rs b/services/api/src/api.rs
diff --git a/services/api/src/lib.rs b/services/api/src/lib.rs
@@ -4,6 +4,7 @@
 use bencher_config as _;
 use bencher_json as _;
 use bencher_logger as _;
+#[cfg(feature = "sentry")]
 use sentry as _;
 use serde_yaml as _;
 use slog as _;
diff --git a/services/cli/Cargo.toml b/services/cli/Cargo.toml
@@ -8,7 +8,11 @@ publish = false
 
 [features]
 default = ["plus"]
-plus = ["bencher_client/plus", "bencher_comment/plus", "bencher_json/plus"]
+plus = [
+    "bencher_client/plus",
+    "bencher_comment/plus",
+    "bencher_json/plus"
+]
 
 [build-dependencies]
 bencher_context = { workspace = true, features = ["client"] }
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 [features]
 default = ["plus"]
 plus = [
-    "bencher_json/plus",
-    "clap/env",
     "dep:async-openai",
     "dep:bencher_bing_index",
     "dep:bencher_client",
     "dep:bencher_license",
     "dep:bencher_google_index",
     "dep:notify-rust",
+    "bencher_json/plus",
+    "clap/env",
 ]
 
 [dependencies]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ plus = [`
`12`	`12`	`"bencher_json/plus",`
`13`	`13`	`"bencher_schema/plus",`
`14`	`14`	`]`
`15`		`-sentry = ["bencher_schema/sentry", "dep:sentry"]`
	`15`	`+sentry = ["dep:sentry", "bencher_schema/sentry"]`
`16`	`16`
`17`	`17`	`[dependencies]`
`18`	`18`	`bencher_endpoint.workspace = true`