diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 07:55:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 07:55:15 -0400 |
| commit | 334edc22d1bd05cbadb1ccc132d099e8a282bff4 (patch) | |
| tree | 2b0b871377b9d2b1e1a5e30d038ba1cedf3d3fd1 /src | |
| parent | 5acbcf150e7c75f0a9bf6e9d8a4f6f5bec7d549a (diff) | |
| parent | 4971d7afa61772137eee880aa20f3b849bd8b9ac (diff) | |
| download | tor-334edc22d1bd05cbadb1ccc132d099e8a282bff4.tar.gz tor-334edc22d1bd05cbadb1ccc132d099e8a282bff4.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/crypto/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/rust/protover/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/rust/tor_log/Cargo.toml | 1 | ||||
| -rw-r--r-- | 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 c0c5e7bf93..08b0832c94 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 af1089c914..a8480e142a 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 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; |