Fix coverage testing on the CI

src/error.rs

@@ -67,7 +67,7 @@ pub struct InsertError<T> {
 }
 
 impl<T> Debug for InsertError<T> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, formatter: &mut Formatter) -> core::result::Result<(), fmt::Error> {
         write!(formatter, "{:?}", self.error)
     }
@@ -76,7 +76,7 @@ impl<T> Debug for InsertError<T> {
 impl<T> From<InsertError<T>> for crate::Error {
     /// Converts the [`InsertError`] into Calloop's error type, throwing away
     /// the contained source.
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn from(e: InsertError<T>) -> crate::Error {
         e.error
     }

src/io.rs

@@ -42,7 +42,7 @@
 }
 
 impl<'l, F: AsFd + std::fmt::Debug> std::fmt::Debug for Async<'l, F> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Async").field("fd", &self.fd).finish()
     }
@@ -180,7 +180,7 @@
     unsafe fn register(&self, dispatcher: &RefCell<IoDispatcher>) -> crate::Result<()> {
         let disp = dispatcher.borrow();
         self.poll.borrow_mut().register(
             unsafe { BorrowedFd::borrow_raw(disp.fd) },
             Interest::EMPTY,
             Mode::OneShot,
             disp.token.expect("No token for IO dispatcher"),

src/lib.rs

@@ -102,7 +102,7 @@
 //!
 //! - [MPSC channels](channel)
 //! - [Timers](timer)
 //! - [unix signals](signals) on Linux
 //!
 //! As well as generic objects backed by file descriptors.
 //!
@@ -143,7 +143,7 @@
 #![warn(missing_docs, missing_debug_implementations)]
 #![allow(clippy::needless_doctest_main)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![cfg_attr(feature = "nightly_coverage", feature(no_coverage))]
+#![cfg_attr(feature = "nightly_coverage", feature(coverage_attribute))]
 
 mod sys;
 

src/loop_logic.rs

@@ -83,14 +83,14 @@ pub struct LoopHandle<'l, Data> {
 }
 
 impl<'l, Data> std::fmt::Debug for LoopHandle<'l, Data> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("LoopHandle { ... }")
     }
 }
 
 impl<'l, Data> Clone for LoopHandle<'l, Data> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn clone(&self) -> Self {
         LoopHandle {
             inner: self.inner.clone(),
@@ -128,7 +128,7 @@ impl<'l, Data> LoopHandle<'l, Data> {
     /// Use this function if you need access to the event source after its insertion in the loop.
     ///
     /// See also `insert_source`.
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)] // Contains a branch we can't hit w/o OOM
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))] // Contains a branch we can't hit w/o OOM
     pub fn register_dispatcher<S>(
         &self,
         dispatcher: Dispatcher<'l, S, Data>,
@@ -282,7 +282,7 @@ pub struct EventLoop<'l, Data> {
 }
 
 impl<'l, Data> std::fmt::Debug for EventLoop<'l, Data> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("EventLoop { ... }")
     }
@@ -659,7 +659,7 @@ pub struct LoopSignal {
 }
 
 impl std::fmt::Debug for LoopSignal {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("LoopSignal { ... }")
     }

src/sources/channel.rs

@@ -36,7 +36,7 @@ pub struct Sender<T> {
 }
 
 impl<T> Clone for Sender<T> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn clone(&self) -> Sender<T> {
         Sender {
             sender: self.sender.clone(),
@@ -72,7 +72,7 @@ pub struct SyncSender<T> {
 }
 
 impl<T> Clone for SyncSender<T> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn clone(&self) -> SyncSender<T> {
         SyncSender {
             sender: self.sender.clone(),

src/sources/mod.rs

@@ -478,7 +478,7 @@ where
 pub struct Dispatcher<'a, S, Data>(Rc<dyn ErasedDispatcher<'a, S, Data> + 'a>);
 
 impl<'a, S, Data> std::fmt::Debug for Dispatcher<'a, S, Data> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Dispatcher { ... }")
     }
@@ -555,7 +555,7 @@ pub struct Idle<'i> {
 }
 
 impl<'i> std::fmt::Debug for Idle<'i> {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Idle { ... }")
     }

src/sources/timer.rs

@@ -280,7 +280,7 @@ impl std::cmp::PartialOrd for TimeoutData {
 // This impl is required for PartialOrd but actually never used
 // and the type is private, so ignore its coverage
 impl std::cmp::PartialEq for TimeoutData {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn eq(&self, other: &Self) -> bool {
         self.deadline == other.deadline
     }
@@ -297,7 +297,7 @@ pub struct TimeoutFuture {
 }
 
 impl std::fmt::Debug for TimeoutFuture {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("TimeoutFuture")
             .field("deadline", &self.deadline)

src/sys.rs

@@ -200,7 +200,7 @@
 }
 
 impl std::fmt::Debug for Poll {
-    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", coverage(off))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Poll { ... }")
     }
@@ -330,7 +330,7 @@
         let ev = cvt_interest(interest, token);
 
         // SAFETY: See invariant on function.
         unsafe {
             self.poller
                 .add_with_mode(raw, ev, cvt_mode(mode, self.poller.supports_level()))?;
         }