Remove log feature

Cargo.toml

@@ -31,7 +31,7 @@ include       = [
 # For documentation of features see the `mio::features` module.
 [features]
 # By default Mio only provides a shell implementation.
-default = ["log"]
+default = []
 
 # Enables the `Poll` and `Registry` types.
 os-poll = []
@@ -45,7 +45,7 @@ os-ext = [
 net = []
 
 [dependencies]
-log = { version = "0.4.8", optional = true }
+log = { version = "0.4.8" }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.149"

examples/udp_server.rs

@@ -77,7 +77,7 @@ fn main() -> io::Result<()> {
                     // This should never happen as we only registered our
                     // `UdpSocket` using the `UDP_SOCKET` token, but if it ever
                     // does we'll log it.
-                    warn!("Got event for unexpected token: {:?}", event);
+                    log::warn!("Got event for unexpected token: {:?}", event);
                 }
             }
         }

src/macros.rs

@@ -68,31 +68,3 @@ macro_rules! cfg_any_os_ext {
         )*
     }
 }
-
-macro_rules! trace {
-    ($($t:tt)*) => {
-        log!(trace, $($t)*)
-    }
-}
-
-macro_rules! warn {
-    ($($t:tt)*) => {
-        log!(warn, $($t)*)
-    }
-}
-
-macro_rules! error {
-    ($($t:tt)*) => {
-        log!(error, $($t)*)
-    }
-}
-
-macro_rules! log {
-    ($level: ident, $($t:tt)*) => {
-        #[cfg(feature = "log")]
-        { log::$level!($($t)*) }
-        // Silence unused variables warnings.
-        #[cfg(not(feature = "log"))]
-        { if false { let _ = ( $($t)* ); } }
-    }
-}

src/poll.rs

@@ -548,7 +548,7 @@ impl Registry {
     where
         S: event::Source + ?Sized,
     {
-        trace!(
+        log::trace!(
             "registering event source with poller: token={:?}, interests={:?}",
             token,
             interests
@@ -616,7 +616,7 @@ impl Registry {
     where
         S: event::Source + ?Sized,
     {
-        trace!(
+        log::trace!(
             "reregistering event source with poller: token={:?}, interests={:?}",
             token,
             interests
@@ -679,7 +679,7 @@ impl Registry {
     where
         S: event::Source + ?Sized,
     {
-        trace!("deregistering event source from poller");
+        log::trace!("deregistering event source from poller");
         source.deregister(self)
     }
 

src/sys/unix/selector/epoll.rs

@@ -152,7 +152,7 @@ impl AsRawFd for Selector {
 impl Drop for Selector {
     fn drop(&mut self) {
         if let Err(err) = syscall!(close(self.ep)) {
-            error!("error closing epoll: {}", err);
+            log::error!("error closing epoll: {}", err);
         }
     }
 }

src/sys/unix/selector/kqueue.rs

@@ -321,7 +321,7 @@ impl AsRawFd for Selector {
 impl Drop for Selector {
     fn drop(&mut self) {
         if let Err(err) = syscall!(close(self.kq)) {
-            error!("error closing kqueue: {}", err);
+            log::error!("error closing kqueue: {}", err);
         }
     }
 }

src/sys/unix/selector/poll.rs

@@ -202,9 +202,9 @@ impl SelectorState {
             }
 
             // Perform the poll.
-            trace!("Polling on {:?}", &fds);
+            log::trace!("Polling on {:?}", &fds);
             let num_events = poll(&mut fds.poll_fds, timeout)?;
-            trace!("Poll finished: {:?}", &fds);
+            log::trace!("Poll finished: {:?}", &fds);
 
             if num_events == 0 {
                 return Ok(());

src/sys/wasi/mod.rs

@@ -79,7 +79,7 @@ impl Selector {
         debug_assert!(events.capacity() >= length);
         #[cfg(debug_assertions)]
         if length == 0 {
-            warn!(
+            log::warn!(
                 "calling mio::Poll::poll with empty subscriptions, this likely not what you want"
             );
         }

tests/util/mod.rs

@@ -149,7 +149,7 @@ pub fn expect_events(poll: &mut Poll, events: &mut Events, mut expected: Vec<Exp
                 expected.swap_remove(index);
             } else {
                 // Must accept sporadic events.
-                warn!("got unexpected event: {:?}", event);
+                log::warn!("got unexpected event: {:?}", event);
             }
         }
 
@@ -170,7 +170,7 @@ pub fn expect_no_events(poll: &mut Poll, events: &mut Events) {
         .expect("unable to poll");
     if !events.is_empty() {
         for event in events.iter() {
-            error!("unexpected event: {:?}", event);
+            log::error!("unexpected event: {:?}", event);
         }
         panic!("received events, but didn't expect any, see above");
     }