From 4971d7afa61772137eee880aa20f3b849bd8b9ac Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Mon, 18 Jun 2018 18:33:49 +0000
Subject: 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/tor_log/Cargo.toml | 1 -
 src/rust/tor_log/tor_log.rs | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/rust/tor_log')

diff --git a/src/rust/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml
index 971cd658b1..9d06299c05 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 1fdc0026bf..ad6725f0f2 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;
-- 
cgit v1.2.3-54-g00ecf