fix: General conditional compilation attributes (#8602)
* 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. * Update changelog * Add `tokio_unstable` to to `unexpected_cfgs` * Update changelog * Fix `tokio_unstable` in `zebrad`
This commit is contained in:
parent
55c69929c5
commit
158d6879fc
|
@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- We realized that a longer than `zcashd` end of support could be problematic in some cases so we reverted back from 20 to 16 weeks ([#8530](https://github.com/ZcashFoundation/zebra/pull/8530))
|
- We realized that a longer than `zcashd` end of support could be problematic in some cases so we reverted back from 20 to 16 weeks ([#8530](https://github.com/ZcashFoundation/zebra/pull/8530))
|
||||||
|
- We're no longer using general conditional compilation attributes for `tor`,
|
||||||
|
but only feature flags instead.
|
||||||
|
|
||||||
## [Zebra 1.7.0](https://github.com/ZcashFoundation/zebra/releases/tag/v1.7.0) - 2024-05-07
|
## [Zebra 1.7.0](https://github.com/ZcashFoundation/zebra/releases/tag/v1.7.0) - 2024-05-07
|
||||||
|
|
||||||
|
|
|
@ -47,3 +47,6 @@ tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.13" }
|
||||||
tower-test = "0.4.0"
|
tower-test = "0.4.0"
|
||||||
|
|
||||||
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37" }
|
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37" }
|
||||||
|
|
||||||
|
[lints.rust]
|
||||||
|
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
|
||||||
|
|
|
@ -16,8 +16,7 @@ use crate::{
|
||||||
|
|
||||||
// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
|
// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
|
||||||
// #[cfg(feature = "tor")]
|
// #[cfg(feature = "tor")]
|
||||||
#[cfg(tor)]
|
// pub(crate) mod tor;
|
||||||
pub(crate) mod tor;
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
|
|
@ -165,13 +165,11 @@ mod protocol;
|
||||||
|
|
||||||
// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
|
// Wait until `arti-client`'s dependency `x25519-dalek v1.2.0` is updated to a higher version. (#5492)
|
||||||
// #[cfg(feature = "tor")]
|
// #[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)
|
// 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(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"))]
|
#[cfg(any(test, feature = "proptest-impl"))]
|
||||||
pub use crate::{
|
pub use crate::{
|
||||||
|
|
|
@ -301,3 +301,6 @@ zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.4" }
|
||||||
# https://github.com/rust-lang/cargo/issues/9096
|
# https://github.com/rust-lang/cargo/issues/9096
|
||||||
# zebra-utils { path = "../zebra-utils", artifact = "bin:zebra-checkpoints" }
|
# zebra-utils { path = "../zebra-utils", artifact = "bin:zebra-checkpoints" }
|
||||||
zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.37" }
|
zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.37" }
|
||||||
|
|
||||||
|
[lints.rust]
|
||||||
|
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
|
||||||
|
|
Loading…
Reference in New Issue