Merge pull request #1 from uklotzde/refacto-client-api

Merge main and fix issues
slowtec · Mar 11, 2024 · 84d419e · 84d419e
2 parents 164082d + 6d2c31c
commit 84d419e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -46,11 +46,11 @@ jobs:
           shared-key: ${{ github.workflow }}-${{ github.job }}
 
       - name: Detect code style issues (push)
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
         if: github.event_name == 'push'
 
       - name: Detect code style issues (pull_request)
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
         if: github.event_name == 'pull_request'
         env:
           SKIP: no-commit-to-branch
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.11.0
+    rev: v9.12.0
     hooks:
       - id: commitlint
         stages:
@@ -44,7 +44,7 @@ repos:
       - id: codespell
         args: [--ignore-words=.codespellignore]
   - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.27.3
+    rev: 0.28.0
     hooks:
       - id: check-github-actions
       - id: check-github-workflows
@@ -66,6 +66,7 @@ repos:
       - id: fmt
         args: [--all, --]
       - id: clippy
+        name: clippy --all-features
         args:
           [
             --locked,
@@ -76,6 +77,18 @@ repos:
             -D,
             warnings,
           ]
+      - id: clippy
+        name: clippy --no-default-features
+        args:
+          [
+            --locked,
+            --workspace,
+            --no-default-features,
+            --all-targets,
+            --,
+            -D,
+            warnings,
+          ]
   - repo: local
     hooks:
       - id: cargo-doc

diff --git a/src/service/mod.rs b/src/service/mod.rs
@@ -7,17 +7,19 @@ pub(crate) mod rtu;
 #[cfg(feature = "tcp")]
 pub(crate) mod tcp;
 
-use std::io;
-
 /// Check that `req_hdr` is the same `Header` as `rsp_hdr`.
 ///
 /// # Errors
 ///
 /// If the 2 headers are different, an [`io::Error`] will be returned with [`io::ErrorKind::InvalidData`].
-fn verify_response_header<H: Eq + std::fmt::Debug>(req_hdr: &H, rsp_hdr: &H) -> io::Result<()> {
+#[cfg(any(feature = "rtu", feature = "tcp"))]
+fn verify_response_header<H: Eq + std::fmt::Debug>(
+    req_hdr: &H,
+    rsp_hdr: &H,
+) -> std::io::Result<()> {
     if req_hdr != rsp_hdr {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidData,
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::InvalidData,
             format!(
                 "Invalid response header: expected/request = {req_hdr:?}, actual/response = {rsp_hdr:?}"
             ),