From e5d573e6876d96b9de2e7b701076dd988f2c92cc Mon Sep 17 00:00:00 2001
From: Marek <mail@marek.onl>
Date: Tue, 11 Jun 2024 17:59:30 +0200
Subject: [PATCH] Remove general conditional compilation flags

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.
---
 zebra-network/src/isolated.rs | 3 +--
 zebra-network/src/lib.rs      | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/zebra-network/src/isolated.rs b/zebra-network/src/isolated.rs
index 62b3eee7a93..c6ca66d53b2 100644
--- a/zebra-network/src/isolated.rs
+++ b/zebra-network/src/isolated.rs
@@ -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;
diff --git a/zebra-network/src/lib.rs b/zebra-network/src/lib.rs
index 254f85cde87..9b61224dc14 100644
--- a/zebra-network/src/lib.rs
+++ b/zebra-network/src/lib.rs
@@ -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::{