update rust + run clippy (#57)

* update rust + run clippy

* try stable

* use beta

* try alekitto/grcov

* try codecov

* remove Z flag

* remove panic

* coveralls

* remove dbg

.github/workflows/actions.yml

@@ -116,7 +116,11 @@ jobs:
     strategy:
       matrix:
         rust:
-          - nightly
+          - stable
+    env:
+      CARGO_INCREMENTAL: "0"
+      RUSTFLAGS: "-Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off"
+      SQLX_OFFLINE: true
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -127,25 +131,22 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
           components: llvm-tools-preview
-      - name: Run coverage
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features --exclude register_derive_impl --workspace --no-fail-fast
-        env:
-          CARGO_INCREMENTAL: "0"
-          RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinstrument-coverage -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
-          RUSTDOCFLAGS: "-Zprofile -Ccodegen-units=1 -Cinstrument-coverage -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
-          SQLX_OFFLINE: true
-      - name: rust-grcov
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Generate code coverage
         id: coverage
-        uses: actions-rs/[email protected]
+        run: cargo llvm-cov --all-features --exclude register_derive_impl --workspace --no-fail-fast --lcov --output-path lcov.info
         env:
-          SQLX_OFFLINE: true
           NODE_COVERALLS_DEBUG: true
+      # - name: Upload coverage to Codecov
+      #   uses: codecov/codecov-action@v3
+      #   with:
+      #     # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+      #     files: lcov.info
+      #     fail_ci_if_error: true
       - name: Coveralls upload
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ${{ steps.coverage.outputs.report }}
+          path-to-lcov: lcov.info
           debug: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.77.2 as builder
+FROM rust:1.83.0 as builder
 # set workdir
 WORKDIR /usr/src/dora
 COPY . .

bin/src/main.rs

@@ -31,8 +31,7 @@ fn main() -> Result<()> {
     // parses from cli or environment var
     let config = cli::Config::parse();
     let trace_config = trace::Config::parse(&config.dora_log)?;
-    debug!(?config);
-    debug!(?trace_config);
+    debug!(?config, ?trace_config);
     if let Err(err) = dotenv::dotenv() {
         debug!(?err, ".env file not loaded");
     }

bin/tests/basic.rs

@@ -286,7 +286,6 @@ fn discover_req_addr() -> Result<()> {
         .target("192.168.2.1".parse::<std::net::IpAddr>().unwrap())
         .port(9900_u16)
         .build()?;
-
     // create a client that sends dhcpv4 messages
     let mut client = Client::<v4::Message>::new(settings);
     // create DISCOVER msg with a requested IP

libs/client-classification/src/lib.rs

@@ -167,7 +167,7 @@ pub struct PacketDetails<'a> {
 }
 
 // useful for testing
-impl<'a> Default for PacketDetails<'a> {
+impl Default for PacketDetails<'_> {
     fn default() -> Self {
         Self {
             iface: "eth0",
@@ -305,7 +305,7 @@ fn split(a: String, del: &str, n: usize) -> Val {
         a.split(del)
             .nth(n - 1)
             .map(ToString::to_string)
-            .unwrap_or(String::new()),
+            .unwrap_or_default(),
     )
 }
 

libs/config/src/v4.rs

@@ -533,7 +533,7 @@ impl<'a> NetRangeIter<'a> {
     }
 }
 
-impl<'a> Iterator for NetRangeIter<'a> {
+impl Iterator for NetRangeIter<'_> {
     type Item = Ipv4Addr;
 
     // skips any IPs in exclusions

libs/icmp-ping/src/icmp.rs

@@ -35,7 +35,7 @@ pub struct EchoRequest<'a> {
     pub payload: &'a [u8],
 }
 
-impl<'a> PartialEq for EchoRequest<'a> {
+impl PartialEq for EchoRequest<'_> {
     fn eq(&self, other: &Self) -> bool {
         // ident potentially will be altered by the kernel because we use DGRAM
         self.seq_cnt == other.seq_cnt && self.payload == other.payload
@@ -49,7 +49,7 @@ impl PartialEq<EchoReply> for EchoRequest<'_> {
     }
 }
 
-impl<'a> Encode<Icmpv4> for EchoRequest<'a> {
+impl Encode<Icmpv4> for EchoRequest<'_> {
     fn encode(&self, buffer: &mut [u8]) -> Result<(), Error> {
         let mut packet =
             icmp::echo_request::MutableEchoRequestPacket::new(buffer).ok_or(Error::InvalidSize)?;
@@ -65,7 +65,7 @@ impl<'a> Encode<Icmpv4> for EchoRequest<'a> {
     }
 }
 
-impl<'a> Encode<Icmpv6> for EchoRequest<'a> {
+impl Encode<Icmpv6> for EchoRequest<'_> {
     fn encode(&self, buffer: &mut [u8]) -> Result<(), Error> {
         // icmpv6::MutableIcmpv6Packet does not have a way to set ident and seq_cnt, so we'll do it manually here
         // set type

rust-toolchain

@@ -1 +1 @@
-1.77.2
+1.83.0