Fix workspace level not(plus) build

epompeii · epompeii · commit d20ad2200bc8 · 2025-11-01T09:35:38.000-05:00
#623
diff --git a/.github/workflows/bencher.yml b/.github/workflows/bencher.yml
@@ -321,29 +321,16 @@ jobs:
       - name: Run Smoke Test
         run: cargo test-api smoke docker
 
-  # Cargo Check (Minus)
-  cargo_check_api_minus:
-    name: Cargo Check API (Minus)
+  # Cargo Check (not(plus))
+  cargo_check_workspace_not_plus:
+    name: Cargo Check Workspace (not(plus))
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: rui314/setup-mold@v1
         with:
           mold-version: ${{ env.MOLD_VERSION }}
       - name: cargo check
-        working-directory: ./services/api
-        run: cargo check --no-default-features
-
-  cargo_check_cli_minus:
-    name: Cargo Check CLI (Minus)
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: rui314/setup-mold@v1
-        with:
-          mold-version: ${{ env.MOLD_VERSION }}
-      - name: cargo check
-        working-directory: ./services/cli
         run: cargo check --no-default-features
 
   # Cargo Benchmark
@@ -1003,8 +990,7 @@ jobs:
       - cargo_test
       - api_smoke_test
       - release_api_smoke_test
-      - cargo_check_api_minus
-      - cargo_check_cli_minus
+      - cargo_check_workspace_not_plus
       - cargo_bench
       - cargo_audit
       - cargo_udeps
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,8 +19,8 @@ license-file = "LICENSE.md"
 
 [workspace.dependencies]
 # services
-bencher_api = { path = "services/api" }
-bencher_cli = { path = "services/cli" }
+bencher_api = { path = "services/api", default-features = false }
+bencher_cli = { path = "services/cli", default-features = false }
 # lib
 bencher_adapter = { path = "lib/bencher_adapter" }
 bencher_boundary = { path = "lib/bencher_boundary" }
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -11,16 +11,13 @@ prerequisites installed on your machine.
 - [Rust](https://www.rust-lang.org/tools/install)
 - [Node.js](https://nodejs.org/)
 - [typeshare](https://crates.io/crates/typeshare)
-
-    ```shell
-    cargo install typeshare-cli --version 1.13.2 --locked
-    ```
-
+   ```shell
+   cargo install typeshare-cli --version 1.13.2 --locked
+   ```
 - [wasm-pack](https://crates.io/crates/wasm-pack)
-
-  ```shell
-  curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-  ```
+   ```shell
+   curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+   ```
 
 ### Installation
 
@@ -49,7 +46,7 @@ prerequisites installed on your machine.
     ```
 7. Configure the CLI environment
    ```shell
-   cd ./services/cli 
+   cd ./services/cli
    . ./env.sh
    ```
 
diff --git a/lib/api_auth/Cargo.toml b/lib/api_auth/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "bencher_endpoint/plus",
     "bencher_json/plus",
diff --git a/lib/api_checkout/Cargo.toml b/lib/api_checkout/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "dep:bencher_rbac",
     "dep:dropshot",
diff --git a/lib/api_checkout/src/checkout.rs b/lib/api_checkout/src/checkout.rs
@@ -38,13 +38,16 @@ pub async fn checkouts_post(
     bearer_token: BearerToken,
     body: TypedBody<JsonNewCheckout>,
 ) -> Result<ResponseCreated<JsonCheckout>, HttpError> {
+    #[cfg(feature = "sentry")]
     sentry::capture_message("Checkout endpoint activated", sentry::Level::Info);
     let auth_user = AuthUser::from_token(rqctx.context(), bearer_token).await?;
     let json = checkouts_post_inner(rqctx.context(), body.into_inner(), &auth_user)
         .await
         .inspect_err(|e| {
             #[cfg(feature = "sentry")]
             sentry::capture_error(&e);
+            #[cfg(not(feature = "sentry"))]
+            let _ = e;
         })?;
     Ok(Post::auth_response_created(json))
 }
diff --git a/lib/api_organizations/Cargo.toml b/lib/api_organizations/Cargo.toml
@@ -7,8 +7,9 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
-    "dep:bencher_billing",
+    "bencher_billing/plus",
     "bencher_endpoint/plus",
     "bencher_json/plus",
     "bencher_schema/plus",
diff --git a/lib/api_organizations/src/plan.rs b/lib/api_organizations/src/plan.rs
@@ -124,6 +124,8 @@ pub async fn org_plan_post(
     .inspect_err(|e| {
         #[cfg(feature = "sentry")]
         sentry::capture_error(e);
+        #[cfg(not(feature = "sentry"))]
+        let _ = e;
     })?;
     Ok(Post::auth_response_created(json))
 }
@@ -255,6 +257,8 @@ pub async fn org_plan_delete(
     .inspect_err(|e| {
         #[cfg(feature = "sentry")]
         sentry::capture_error(&e);
+        #[cfg(not(feature = "sentry"))]
+        let _ = e;
     })?;
     Ok(Delete::auth_response_deleted())
 }
@@ -287,6 +291,8 @@ async fn delete_inner(
         .inspect_err(|e| {
             #[cfg(feature = "sentry")]
             sentry::capture_error(&e);
+            #[cfg(not(feature = "sentry"))]
+            let _ = e;
         });
 
     diesel::delete(schema::plan::table.filter(schema::plan::id.eq(query_plan.id)))
diff --git a/lib/api_projects/Cargo.toml b/lib/api_projects/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "bencher_endpoint/plus",
     "bencher_json/plus",
diff --git a/lib/api_run/Cargo.toml b/lib/api_run/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "bencher_endpoint/plus",
     "bencher_json/plus",
diff --git a/lib/api_server/Cargo.toml b/lib/api_server/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "bencher_endpoint/plus",
     "bencher_config/plus",
diff --git a/lib/api_users/Cargo.toml b/lib/api_users/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
     "bencher_endpoint/plus",
     "bencher_json/plus",
diff --git a/lib/bencher_adapter/Cargo.toml b/lib/bencher_adapter/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = ["bencher_json/plus"]
 
 [dependencies]
diff --git a/lib/bencher_boundary/Cargo.toml b/lib/bencher_boundary/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 client = ["bencher_json/client"]
 server = ["bencher_json/server"]
 plus = ["bencher_json/plus"]
diff --git a/lib/bencher_client/Cargo.toml b/lib/bencher_client/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 client = ["bencher_json/client"]
 server = ["bencher_json/server"]
 plus = ["bencher_json/plus"]
diff --git a/lib/bencher_comment/Cargo.toml b/lib/bencher_comment/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = ["bencher_json/plus"]
 
 [dependencies]
diff --git a/lib/bencher_config/Cargo.toml b/lib/bencher_config/Cargo.toml
@@ -7,13 +7,14 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
-    "dep:bencher_billing",
     "dep:bencher_github_client",
     "dep:bencher_google_client",
-    "dep:bencher_license",
+    "bencher_billing/plus",
     "bencher_endpoint/plus",
     "bencher_json/plus",
+    "bencher_license/plus",
     "bencher_schema/plus",
 ]
 sentry = ["bencher_schema/sentry"]
diff --git a/lib/bencher_context/Cargo.toml b/lib/bencher_context/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 client = ["dep:gix", "dep:uuid", "dep:windows", "bencher_valid/client"]
 server = ["bencher_valid/server"]
 schema = ["dep:schemars"]
diff --git a/lib/bencher_endpoint/Cargo.toml b/lib/bencher_endpoint/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = ["bencher_schema/plus"]
 
 [dependencies]
diff --git a/lib/bencher_json/Cargo.toml b/lib/bencher_json/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 client = ["bencher_context/client", "bencher_valid/client"]
 table = ["dep:tabled"]
 server = ["bencher_context/server", "bencher_valid/server"]
diff --git a/lib/bencher_schema/Cargo.toml b/lib/bencher_schema/Cargo.toml
@@ -7,17 +7,18 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = [
-    "dep:bencher_billing",
     "dep:bencher_bing_index",
     "dep:bencher_github_client",
     "dep:bencher_google_client",
     "dep:bencher_google_index",
-    "dep:bencher_license",
     "dep:reqwest",
     "dep:serde_json",
     "bencher_adapter/plus",
+    "bencher_billing/plus",
     "bencher_json/plus",
+    "bencher_license/plus",
 ]
 sentry = ["dep:sentry"]
 
diff --git a/lib/bencher_schema/src/model/server/plus/mod.rs b/lib/bencher_schema/src/model/server/plus/mod.rs
@@ -130,6 +130,7 @@ impl QueryServer {
                 } else {
                     let err = "Bencher Cloud server stats are disabled!";
                     slog::error!(log, "{err}");
+                    #[cfg(feature = "sentry")]
                     sentry::capture_message(err, sentry::Level::Error);
                 }
 
diff --git a/lib/bencher_token/Cargo.toml b/lib/bencher_token/Cargo.toml
@@ -7,6 +7,7 @@ license-file.workspace = true
 publish = false
 
 [features]
+default = []
 plus = ["bencher_json/plus"]
 
 [dependencies]
diff --git a/lib/bencher_valid/Cargo.toml b/lib/bencher_valid/Cargo.toml
@@ -10,6 +10,7 @@ publish = false
 crate-type = ["cdylib", "rlib"]
 
 [features]
+default = []
 client = ["dep:regex-lite"]
 server = ["dep:rand", "dep:regex"]
 schema = ["dep:schemars", "ordered-float/schemars"]
diff --git a/plus/bencher_billing/Cargo.toml b/plus/bencher_billing/Cargo.toml
@@ -6,13 +6,24 @@ edition.workspace = true
 license-file.workspace = true
 publish = false
 
+[features]
+default = []
+# Required due to feature unification
+# https://doc.rust-lang.org/cargo/reference/features.html#feature-unification
+plus = [
+    "dep:bencher_json",
+    "dep:thiserror",
+    "dep:uuid",
+    "dep:async-stripe",
+]
+
 [dependencies]
 # Workspace
-bencher_json = { workspace = true, features = ["server", "plus"] }
-thiserror.workspace = true
-uuid.workspace = true
+bencher_json = { workspace = true, optional = true, features = ["server", "plus"] }
+thiserror = { workspace = true, optional = true }
+uuid = { workspace = true, optional = true }
 # Crate
-async-stripe = { version = "0.39", features = ["runtime-tokio-hyper-rustls"] }
+async-stripe = { version = "0.39", optional = true, features = ["runtime-tokio-hyper-rustls"] }
 
 [dev-dependencies]
 chrono.workspace = true
diff --git a/plus/bencher_billing/src/lib.rs b/plus/bencher_billing/src/lib.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "plus")]
+
 pub use stripe::{
     CardDetailsParams as PaymentCard, CheckoutSessionId, CustomerId, ParseIdError, PaymentMethodId,
     SubscriptionId,
diff --git a/plus/bencher_license/Cargo.toml b/plus/bencher_license/Cargo.toml
@@ -6,13 +6,25 @@ edition.workspace = true
 license-file.workspace = true
 publish = false
 
+[features]
+default = []
+# Required due to feature unification
+# https://doc.rust-lang.org/cargo/reference/features.html#feature-unification
+plus = [
+    "dep:bencher_json",
+    "dep:chrono",
+    "dep:jsonwebtoken",
+    "dep:thiserror",
+    "dep:serde",
+]
+
 [dependencies]
 # Workspace
-bencher_json = { workspace = true, features = ["server", "plus"] }
-chrono.workspace = true
-jsonwebtoken = { workspace = true, features = ["use_pem"] }
-thiserror.workspace = true
-serde.workspace = true
+bencher_json = { workspace = true, optional = true, features = ["server", "plus"] }
+chrono = { workspace = true, optional = true }
+jsonwebtoken = { workspace = true, optional = true, features = ["use_pem"] }
+thiserror = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
 
 [dev-dependencies]
 pretty_assertions.workspace = true
diff --git a/plus/bencher_license/src/lib.rs b/plus/bencher_license/src/lib.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "plus")]
+
 mod audience;
 mod billing_cycle;
 mod claims;
diff --git a/tasks/gen_pkg/Cargo.toml b/tasks/gen_pkg/Cargo.toml
@@ -6,6 +6,10 @@ edition.workspace = true
 license-file.workspace = true
 publish = false
 
+[features]
+default = ["plus"]
+plus = ["bencher_cli/plus"]
+
 [dependencies]
 # Workspace
 bencher_cli.workspace = true
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
diff --git a/xtask/src/parser/live.rs b/xtask/src/parser/live.rs
diff --git a/xtask/src/parser/mod.rs b/xtask/src/parser/mod.rs
diff --git a/xtask/src/parser/plus/email_list.rs b/xtask/src/parser/plus/email_list.rs
diff --git a/xtask/src/task/live.rs b/xtask/src/task/live.rs
diff --git a/xtask/src/task/mod.rs b/xtask/src/task/mod.rs
