itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-01 12:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: fix build with only process (#1575)

Browse Source
This commit is contained in:
Carl Lerche 2019-09-19 12:38:15 -07:00 committed by GitHub
parent 815173f8e5
commit 8d09f61d33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-tests/Cargo.toml
View File

@ -11,6 +11,7 @@ net-no-features = ["tokio-net"]
net-with-tcp = ["tokio-net/tcp"] net-with-tcp = ["tokio-net/tcp"]
net-with-udp = ["tokio-net/udp"] net-with-udp = ["tokio-net/udp"]
net-with-uds = ["tokio-net/uds"] net-with-uds = ["tokio-net/uds"]
net-with-process = ["tokio-net/process"]
tokio-no-features = ["tokio"] tokio-no-features = ["tokio"]
tokio-with-net = ["tokio/net"] tokio-with-net = ["tokio/net"]

6
build-tests/tests/features.rs
View File

@ -25,6 +25,12 @@ fn net_with_udp() {
use build_tests::tokio_net::uds; use build_tests::tokio_net::uds;
} }
#[test]
#[cfg(feature = "net-with-process")]
fn net_with_process() {
use build_tests::tokio_net::process;
}
#[test] #[test]
#[cfg(feature = "tokio-with-net")] #[cfg(feature = "tokio-with-net")]
fn tokio_with_net() { fn tokio_with_net() {

1
tokio-net/Cargo.toml
View File

@ -23,6 +23,7 @@ categories = ["asynchronous", "network-programming"]
[features] [features]
async-traits = [] async-traits = []
process = [ process = [
"tokio-io/util",
"crossbeam-queue", "crossbeam-queue",
"libc", "libc",
"mio-named-pipes", "mio-named-pipes",

6
tokio-net/src/tracing.rs
View File

@ -25,7 +25,7 @@ macro_rules! trace {
#[cfg(not(feature = "tracing"))] #[cfg(not(feature = "tracing"))]
macro_rules! trace { macro_rules! trace {
($($arg:tt)+) => {}; ($($arg:tt)+) => {{}};
} }
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]
@ -37,7 +37,7 @@ macro_rules! debug {
#[cfg(not(feature = "tracing"))] #[cfg(not(feature = "tracing"))]
macro_rules! debug { macro_rules! debug {
($($arg:tt)+) => {}; ($($arg:tt)+) => {{}};
} }
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]
@ -49,7 +49,7 @@ macro_rules! error {
#[cfg(not(feature = "tracing"))] #[cfg(not(feature = "tracing"))]
macro_rules! error { macro_rules! error {
($($arg:tt)+) => {}; ($($arg:tt)+) => {{}};
} }
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]