Skip to content

Commit 477c84c

Browse files
committed
Fix multi-target not(plus) build
#623
1 parent 1d1c456 commit 477c84c

File tree

7 files changed

+19
-5
lines changed

7 files changed

+19
-5
lines changed

lib/api_auth/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#[cfg(not(feature = "plus"))]
2+
use schemars as _;
3+
#[cfg(not(feature = "plus"))]
4+
use serde as _;
5+
16
mod accept;
27
mod confirm;
38
mod login;

lib/bencher_adapter/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ edition.workspace = true
66
license-file.workspace = true
77
publish = false
88

9+
[features]
10+
plus = ["bencher_json/plus"]
11+
912
[dependencies]
1013
# Workspace
1114
bencher_json = { workspace = true, features = ["server"] }

lib/bencher_client/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ license-file.workspace = true
77
publish = false
88

99
[features]
10-
default = ["client", "plus", "rustls-tls"]
1110
client = ["bencher_json/client"]
1211
server = ["bencher_json/server"]
1312
plus = ["bencher_json/plus"]

lib/bencher_json/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@ pub use run::JsonNewRun;
7575
pub use system::{
7676
auth::{JsonAccept, JsonAuthAck, JsonAuthUser, JsonConfirm, JsonLogin, JsonSignup},
7777
backup::{JsonBackup, JsonBackupCreated},
78-
config::JsonConfig,
78+
config::{JsonConfig, JsonConsole},
7979
restart::JsonRestart,
8080
spec::JsonSpec,
8181
version::JsonApiVersion,
8282
};
8383
#[cfg(feature = "plus")]
8484
pub use system::{
8585
auth::{JsonOAuth, JsonOAuthUrl, JsonOAuthUser},
86-
config::JsonConsole,
8786
payment::JsonPayment,
8887
server::{JsonServer, JsonServerStats, ServerUuid},
8988
};

lib/bencher_schema/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ plus = [
1616
"dep:bencher_license",
1717
"dep:reqwest",
1818
"dep:serde_json",
19+
"bencher_adapter/plus",
1920
"bencher_json/plus",
2021
]
2122
sentry = ["dep:sentry"]

services/api/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#[cfg(not(feature = "plus"))]
2+
use api_checkout as _;
13
// Needed for binary
24
use bencher_config as _;
35
use bencher_json as _;

services/cli/Cargo.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ publish = false
88

99
[features]
1010
default = ["plus"]
11-
plus = ["bencher_client/plus", "bencher_comment/plus", "bencher_json/plus"]
11+
plus = [
12+
"bencher_adapter/plus",
13+
"bencher_client/plus",
14+
"bencher_comment/plus",
15+
"bencher_json/plus",
16+
]
1217

1318
[dependencies]
1419
# Workspace
1520
bencher_adapter.workspace = true
16-
bencher_client.workspace = true
21+
bencher_client = { workspace = true, features = ["client", "rustls-tls"] }
1722
bencher_comment.workspace = true
1823
bencher_json = { workspace = true, features = ["client", "table"] }
1924
camino.workspace = true

0 commit comments

Comments
 (0)