commit 4971d7afa61772137eee880aa20f3b849bd8b9ac Author: Isis Lovecruft isis@torproject.org Date: Mon Jun 18 18:33:49 2018 +0000

rust: Remove redundant "testing" feature from tor_log crate.

It was synonymous with the builtin "test" feature.

* FIXES #26399: https://bugs.torproject.org/26399 --- src/rust/crypto/Cargo.toml | 1 - src/rust/protover/Cargo.toml | 1 - src/rust/tor_log/Cargo.toml | 1 - src/rust/tor_log/tor_log.rs | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index c0c5e7bf9..08b0832c9 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -25,5 +25,4 @@ rand = { version = "=0.5.0-pre.2", default-features = false } rand_core = { version = "=0.2.0-pre.0", default-features = false }

[features] -testing = ["tor_log/testing"]

diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml index af1089c91..a8480e142 100644 --- a/src/rust/protover/Cargo.toml +++ b/src/rust/protover/Cargo.toml @@ -4,7 +4,6 @@ version = "0.0.1" name = "protover"

[features] -testing = ["tor_log/testing"]

[dependencies] libc = "=0.2.39" diff --git a/src/rust/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml index 971cd658b..9d06299c0 100644 --- a/src/rust/tor_log/Cargo.toml +++ b/src/rust/tor_log/Cargo.toml @@ -9,7 +9,6 @@ path = "lib.rs" crate_type = ["rlib", "staticlib"]

[features] -testing = []

[dependencies] libc = "0.2.39" diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 1fdc0026b..ad6725f0f 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -88,7 +88,7 @@ pub fn tor_log_msg_impl(

/// This implementation is used when compiling for actual use, as opposed to /// testing. -#[cfg(all(not(test), not(feature = "testing")))] +#[cfg(not(test))] pub mod log { use libc::{c_char, c_int}; use super::LogDomain; @@ -142,7 +142,7 @@ pub mod log {

/// This module exposes no-op functionality for testing other Rust modules /// without linking to C. -#[cfg(any(test, feature = "testing"))] +#[cfg(test)] pub mod log { use libc::{c_char, c_int}; use super::LogDomain;