Skip to content

Commit b8c39bb

Browse files
nepetcdecker
authored andcommitted
rs: Refine lib.rs checking for server flag
The `cfg-if` macro allows us to organise feature flag related exports in a more concise way. Signed-off-by: Peter Neuroth <pet.v.ne@gmail.com>
1 parent e0ded49 commit b8c39bb

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

Cargo.lock

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

cln-grpc/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@ server = ["cln-rpc"]
1515
[dependencies]
1616
anyhow = "1.0"
1717
log = "0.4"
18-
cln-rpc = { path="../cln-rpc/", version = "0.4", optional = true }
18+
cln-rpc = { path = "../cln-rpc/", version = "0.4", optional = true }
19+
cfg-if = "1.0"
1920
serde = { version = "1.0", features = ["derive"] }
2021
tonic = { version = "0.11", features = ["tls", "transport"] }
2122
prost = "0.12"
2223
hex = "0.4.3"
23-
bitcoin = { version = "0.31", features = [ "serde" ] }
24+
bitcoin = { version = "0.31", features = ["serde"] }
2425
tokio-stream = { version = "0.1.14", features = ["sync"] }
2526
tokio = { version = "1.36.0", features = ["sync"] }
2627
futures-core = "0.3.30"
2728
tokio-util = "0.7.10"
2829

2930
[dev-dependencies]
3031
serde_json = "1.0.72"
31-
cln-rpc = { path="../cln-rpc/", version = "0.4" }
32+
cln-rpc = { path = "../cln-rpc/", version = "0.4" }
3233

3334
[build-dependencies]
3435
tonic-build = "0.11"

cln-grpc/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Huge json!() macros require lots of recursion
22
#![recursion_limit = "1024"]
33

4-
#[cfg(feature = "server")]
5-
mod convert;
64
pub mod pb;
75

8-
#[cfg(feature = "server")]
9-
mod server;
10-
11-
#[cfg(feature = "server")]
12-
pub use crate::server::Server;
6+
cfg_if::cfg_if! {
7+
if #[cfg(feature = "server")] {
8+
mod convert;
9+
mod server;
10+
pub use server::Server;
11+
}
12+
}
1313

1414
#[cfg(test)]
1515
mod test;

0 commit comments

Comments
 (0)