Skip to content

Commit 6e6215a

Browse files
epompeiiepompeii
committed
fix_features
1 parent fee438b commit 6e6215a

File tree

20 files changed

+31
-36
lines changed

20 files changed

+31
-36
lines changed

‎Cargo.lock

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/api_auth/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ sentry = ["bencher_schema/sentry"]
1616

1717
[dependencies]
1818
bencher_endpoint.workspace = true
19-
bencher_billing = { workspace = true, optional = true }
2019
bencher_json = { workspace = true, features = ["server", "schema", "db"] }
2120
bencher_schema.workspace = true
2221
dropshot.workspace = true

‎lib/api_checkout/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ plus = [
1212
"bencher_json/plus",
1313
"bencher_schema/plus",
1414
]
15-
sentry = ["bencher_schema/sentry", "dep:sentry"]
15+
sentry = ["dep:sentry", "bencher_schema/sentry"]
1616

1717
[dependencies]
1818
bencher_endpoint.workspace = true
19-
bencher_billing = { workspace = true, optional = true }
2019
bencher_json = { workspace = true, features = ["server", "schema"] }
2120
bencher_rbac.workspace = true
2221
bencher_schema.workspace = true

‎lib/api_organizations/Cargo.toml

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

99
[features]
1010
plus = [
11+
"dep:bencher_billing",
1112
"bencher_endpoint/plus",
1213
"bencher_json/plus",
1314
"bencher_schema/plus",
14-
"dep:bencher_billing",
1515
]
16-
sentry = ["bencher_schema/sentry", "dep:sentry"]
16+
sentry = ["dep:sentry", "bencher_schema/sentry"]
1717

1818
[dependencies]
1919
bencher_endpoint.workspace = true

‎lib/api_projects/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plus = [
1212
"bencher_json/plus",
1313
"bencher_schema/plus",
1414
]
15-
sentry = ["bencher_schema/sentry", "dep:sentry"]
15+
sentry = ["dep:sentry", "bencher_schema/sentry"]
1616

1717
[dependencies]
1818
bencher_endpoint.workspace = true

‎lib/api_projects/src/projects.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ pub async fn project_patch(
251251
let auth_user = AuthUser::from_token(rqctx.context(), bearer_token).await?;
252252
let context = rqctx.context();
253253
let json = patch_inner(
254+
#[cfg(feature = "plus")]
254255
&rqctx.log,
255256
context,
256257
path_params.into_inner(),
@@ -262,7 +263,7 @@ pub async fn project_patch(
262263
}
263264

264265
async fn patch_inner(
265-
log: &Logger,
266+
#[cfg(feature = "plus")] log: &Logger,
266267
context: &ApiContext,
267268
path_params: ProjectParams,
268269
json_project: JsonUpdateProject,
@@ -331,6 +332,7 @@ pub async fn project_delete(
331332
) -> Result<ResponseDeleted, HttpError> {
332333
let auth_user = AuthUser::from_token(rqctx.context(), bearer_token).await?;
333334
delete_inner(
335+
#[cfg(feature = "plus")]
334336
&rqctx.log,
335337
rqctx.context(),
336338
path_params.into_inner(),
@@ -341,7 +343,7 @@ pub async fn project_delete(
341343
}
342344

343345
async fn delete_inner(
344-
log: &Logger,
346+
#[cfg(feature = "plus")] log: &Logger,
345347
context: &ApiContext,
346348
path_params: ProjectParams,
347349
auth_user: &AuthUser,

‎lib/api_server/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ sentry = ["bencher_config/sentry", "bencher_schema/sentry"]
1818
[dependencies]
1919
async-compression = { workspace = true, features = ["tokio", "gzip"] }
2020
bencher_endpoint.workspace = true
21-
bencher_billing = { workspace = true, optional = true }
2221
bencher_config.workspace = true
2322
bencher_json = { workspace = true, features = ["server", "schema", "db"] }
2423
bencher_schema.workspace = true

‎lib/api_users/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ sentry = ["bencher_schema/sentry"]
1616

1717
[dependencies]
1818
bencher_endpoint.workspace = true
19-
bencher_billing = { workspace = true, optional = true }
2019
bencher_json = { workspace = true, features = ["server", "schema", "db"] }
2120
bencher_schema.workspace = true
2221
diesel.workspace = true

‎lib/bencher_config/Cargo.toml

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

99
[features]
1010
plus = [
11-
"bencher_endpoint/plus",
12-
"bencher_json/plus",
13-
"bencher_schema/plus",
1411
"dep:bencher_billing",
1512
"dep:bencher_github",
1613
"dep:bencher_license",
14+
"bencher_endpoint/plus",
15+
"bencher_json/plus",
16+
"bencher_schema/plus",
1717
]
1818
sentry = ["bencher_schema/sentry"]
1919

‎lib/bencher_config/src/config_tx.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ use bencher_schema::context::{ApiContext, Database, DbConnection};
1515
#[cfg(feature = "plus")]
1616
use bencher_schema::model::server::QueryServer;
1717
use bencher_token::TokenKey;
18-
use diesel::{connection::SimpleConnection, Connection};
18+
#[cfg(feature = "plus")]
19+
use diesel::connection::SimpleConnection;
20+
use diesel::Connection;
1921
use dropshot::{
2022
ApiDescription, ConfigDropshot, ConfigLogging, ConfigLoggingIfExists, ConfigLoggingLevel,
2123
ConfigTls, HttpServer,

‎lib/bencher_endpoint/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ license-file.workspace = true
77
publish = false
88

99
[features]
10-
plus = [
11-
"bencher_schema/plus",
12-
]
10+
plus = ["bencher_schema/plus"]
1311

1412
[dependencies]
1513
bencher_schema.workspace = true

‎lib/bencher_json/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ client = ["bencher_context/client", "bencher_valid/client"]
1111
table = ["dep:tabled"]
1212
server = ["bencher_valid/server"]
1313
schema = ["dep:schemars", "bencher_context/schema", "ordered-float/schemars"]
14-
db = ["diesel", "serde_yaml", "bencher_valid/db"]
14+
db = ["dep:diesel", "dep:serde_yaml", "bencher_valid/db"]
1515
plus = ["bencher_valid/plus"]
1616

1717
[dependencies]

‎lib/bencher_plot/Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ edition.workspace = true
66
license-file.workspace = true
77
publish = false
88

9-
[features]
10-
default = ["server"]
11-
client = ["bencher_json/client"]
12-
server = ["bencher_json/server"]
13-
149
[dependencies]
15-
bencher_json.workspace = true
10+
bencher_json = {workspace = true, features = ["server"] }
1611
chrono.workspace = true
1712
ordered-float.workspace = true
1813
thiserror.workspace = true

‎lib/bencher_schema/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ publish = false
88

99
[features]
1010
plus = [
11-
"bencher_json/plus",
1211
"dep:bencher_billing",
1312
"dep:bencher_bing_index",
1413
"dep:bencher_github",
1514
"dep:bencher_google_index",
1615
"dep:bencher_license",
1716
"dep:reqwest",
17+
"dep:serde_json",
18+
"bencher_json/plus",
1819
]
1920
sentry = ["dep:sentry"]
2021

@@ -37,7 +38,7 @@ derive_more.workspace = true
3738
diesel = { workspace = true, features = ["chrono", "sqlite"] }
3839
dropshot.workspace = true
3940
http.workspace = true
40-
serde_json.workspace = true
41+
serde_json = {workspace = true, optional = true}
4142
serde_urlencoded.workspace = true
4243
oso.workspace = true
4344
reqwest = { workspace = true, optional = true, features = ["rustls-tls"] }

‎lib/bencher_valid/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ crate-type = ["cdylib", "rlib"]
1212
[features]
1313
client = ["dep:regex-lite"]
1414
server = ["dep:rand", "dep:regex"]
15+
schema = ["dep:schemars", "ordered-float/schemars"]
1516
db = ["dep:diesel"]
1617
plus = ["chrono/clock"]
17-
schema = ["dep:schemars", "ordered-float/schemars"]
1818
wasm = [
19+
"client",
1920
"dep:console_error_panic_hook",
2021
"dep:wasm-bindgen",
2122
"dep:serde_json",
2223
"chrono/wasmbind",
23-
"client",
2424
]
2525

2626
[dependencies]

‎services/api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ plus = [
2222
"bencher_schema/plus",
2323
]
2424
sentry = [
25+
"dep:sentry",
2526
"api_auth/sentry",
2627
"api_checkout/sentry",
2728
"api_organizations/sentry",
@@ -31,7 +32,6 @@ sentry = [
3132
"api_users/sentry",
3233
"bencher_config/sentry",
3334
"bencher_schema/sentry",
34-
"dep:sentry"
3535
]
3636

3737
[dependencies]

‎services/api/src/api/mod.rs renamed to ‎services/api/src/api.rs

File renamed without changes.

‎services/api/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use bencher_config as _;
55
use bencher_json as _;
66
use bencher_logger as _;
7+
#[cfg(feature = "sentry")]
78
use sentry as _;
89
use serde_yaml as _;
910
use slog as _;

‎services/cli/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ publish = false
88

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

1317
[build-dependencies]
1418
bencher_context = { workspace = true, features = ["client"] }

‎xtask/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ publish = false
99
[features]
1010
default = ["plus"]
1111
plus = [
12-
"bencher_json/plus",
13-
"clap/env",
1412
"dep:async-openai",
1513
"dep:bencher_bing_index",
1614
"dep:bencher_client",
1715
"dep:bencher_license",
1816
"dep:bencher_google_index",
1917
"dep:notify-rust",
18+
"bencher_json/plus",
19+
"clap/env",
2020
]
2121

2222
[dependencies]

0 commit comments

Comments
 (0)