nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
It was synonymous with the builtin "test" feature.

 * FIXES #26399: https://bugs.torproject.org/26399
This commit is contained in:
Isis Lovecruft 2018-06-18 18:33:49 +00:00 committed by Nick Mathewson
parent 38cb638c32
commit 4971d7afa6
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rust/crypto/Cargo.toml
View File

@ -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"]

1
src/rust/protover/Cargo.toml
View File

@ -4,7 +4,6 @@ version = "0.0.1"
name = "protover"
[features]
testing = ["tor_log/testing"]
[dependencies]
libc = "=0.2.39"

1
src/rust/tor_log/Cargo.toml
View File

@ -9,7 +9,6 @@ path = "lib.rs"
crate_type = ["rlib", "staticlib"]
[features]
testing = []
[dependencies]
libc = "0.2.39"

4
src/rust/tor_log/tor_log.rs
View File

@ -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;