CI: Use a cargo feature to control 'no_coverage'

Author: elinorbgr

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Clippy
-        run: cargo clippy --workspace --all-features --all-targets -- -D warnings
+        run: cargo clippy --workspace --all-targets --features "block_on executor" -- -D warnings
 
   ci-linux:
     name: CI
@@ -128,7 +128,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all-features
+          args: --features "block_on executor"
 
       - name: Run book tests
         uses: actions-rs/cargo@v1
@@ -254,7 +254,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: doc
-          args: --no-deps --all-features
+          args: --no-deps --features "block_on executor"
 
       - run: rsync -r target/doc/ doc/src/api
 

Cargo.toml

@@ -36,9 +36,10 @@ futures = "0.3.5"
 [features]
 block_on = ["pin-utils"]
 executor = ["async-task"]
+nightly_coverage = []
 
 [package.metadata.docs.rs]
-all-features = true
+features = ["block_on", "executor"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [[test]]

clippy.toml

@@ -44,7 +44,7 @@ pub enum Error {
 impl From<nix::errno::Errno> for Error {
     /// Converts a [`nix::Error`] into a wrapped version of the equivalent
     /// [`std::io::Error`].
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn from(err: nix::errno::Errno) -> Self {
         Into::<std::io::Error>::into(err).into()
     }
@@ -76,7 +76,7 @@ pub struct InsertError<T> {
 }
 
 impl<T> Debug for InsertError<T> {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, formatter: &mut Formatter) -> core::result::Result<(), fmt::Error> {
         write!(formatter, "{:?}", self.error)
     }
@@ -85,7 +85,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(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn from(e: InsertError<T>) -> crate::Error {
         e.error
     }

src/error.rs

@@ -41,7 +41,7 @@ pub struct Async<'l, F: AsFd> {
 }
 
 impl<'l, F: AsFd + std::fmt::Debug> std::fmt::Debug for Async<'l, F> {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Async").field("fd", &self.fd).finish()
     }

src/io.rs

@@ -143,7 +143,7 @@
 #![warn(missing_docs, missing_debug_implementations)]
 #![allow(clippy::needless_doctest_main)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![cfg_attr(coverage, feature(no_coverage))]
+#![cfg_attr(feature = "nightly_coverage", feature(no_coverage))]
 
 mod sys;
 

src/lib.rs

@@ -70,14 +70,14 @@ pub struct LoopHandle<'l, Data> {
 }
 
 impl<'l, Data> std::fmt::Debug for LoopHandle<'l, Data> {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     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(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn clone(&self) -> Self {
         LoopHandle {
             inner: self.inner.clone(),
@@ -115,7 +115,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(coverage, no_coverage)] // Contains a branch we can't hit w/o OOM
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)] // Contains a branch we can't hit w/o OOM
     pub fn register_dispatcher<S>(
         &self,
         dispatcher: Dispatcher<'l, S, Data>,
@@ -241,7 +241,7 @@ pub struct EventLoop<'l, Data> {
 }
 
 impl<'l, Data> std::fmt::Debug for EventLoop<'l, Data> {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("EventLoop { ... }")
     }
@@ -573,7 +573,7 @@ pub struct LoopSignal {
 }
 
 impl std::fmt::Debug for LoopSignal {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("LoopSignal { ... }")
     }

src/loop_logic.rs

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

src/sources/channel.rs

@@ -103,10 +103,7 @@ enum Active<T> {
 
 impl<T> Active<T> {
     fn is_finished(&self) -> bool {
-        match self {
-            Active::Finished(_) => true,
-            _ => false,
-        }
+        matches!(self, Active::Finished(_))
     }
 }
 

src/sources/futures.rs

@@ -412,7 +412,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(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Dispatcher { ... }")
     }
@@ -485,7 +485,7 @@ pub struct Idle<'i> {
 }
 
 impl<'i> std::fmt::Debug for Idle<'i> {
-    #[cfg_attr(coverage, no_coverage)]
+    #[cfg_attr(feature = "nightly_coverage", no_coverage)]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Idle { ... }")
     }