Skip to content

Commit

Permalink
Remove general conditional compilation flags
Browse files Browse the repository at this point in the history
See https://blog.rust-lang.org/2024/05/06/check-cfg.html

The conditional compilation flags for tor were superfluous as we can
make do fine with using only features.
  • Loading branch information
upbqdn committed Jun 11, 2024
1 parent 55c6992 commit e5d573e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions zebra-network/src/isolated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ use crate::{

// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
// #[cfg(feature = "tor")]
#[cfg(tor)]
pub(crate) mod tor;
// pub(crate) mod tor;

#[cfg(test)]
mod tests;
Expand Down
6 changes: 2 additions & 4 deletions zebra-network/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,11 @@ mod protocol;

// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
// #[cfg(feature = "tor")]
#[cfg(tor)]
pub use crate::isolated::tor::connect_isolated_tor;
// pub use crate::isolated::tor::connect_isolated_tor;

// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
// #[cfg(all(feature = "tor", any(test, feature = "proptest-impl")))]
#[cfg(tor)]
pub use crate::isolated::tor::connect_isolated_tor_with_inbound;
// pub use crate::isolated::tor::connect_isolated_tor_with_inbound;

#[cfg(any(test, feature = "proptest-impl"))]
pub use crate::{
Expand Down

0 comments on commit e5d573e

Please sign in to comment.