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

It was synonymous with the builtin "test" feature.

 * FIXES #26399: https://bugs.torproject.org/26399

diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml
index c0c5e7bf93c57b7b54c06dfa86ff0b315d0b70d6..08b0832c94866c83e925a32f307f8ddbdb11bd4a 100644 (file)
--- 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 af1089c91404b197f51da3ecc676403ea0eeb238..a8480e142ae56a8e20f79a66f462e36775bf5878 100644 (file)
--- 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 971cd658b15225abb26a42b1b9f827b3bfeed53b..9d06299c051799275b10d16dd9c5c6d1124970e5 100644 (file)
--- 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 1fdc0026bf1860de3a10e6bef9178dbfd6fd8938..ad6725f0f27a3f2ccf72b7bf30ee78d7c4baa137 100644 (file)
--- 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;