Fix lint issues (#3)

.github/workflows/ci.yml

@@ -4,35 +4,43 @@ on:
   workflow_dispatch:
   pull_request:
   push:
+    branches:
+      - master
 
 jobs:
   unit-test:
-    name: Unit test using ${{matrix.rust}}
+    name: Unit test
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        rust: [ 1.77, nightly, beta, stable ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{matrix.rust}}
+          toolchain: stable
+          components: clippy
+      - uses: extractions/setup-just@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@nextest
       - name: Run unit tests
         run: |
-          cargo test --release
+          just unit-test
+
   lint:
     name: Lint
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           components: clippy
+      - uses: extractions/setup-just@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Run lint
-        run: cargo clippy --all-targets --all-features
+        run: just lint

Cargo.toml

@@ -17,4 +17,4 @@ tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18" }
 tower-http = { version = "0.5.2", features = ["add-extension", "trace", "cors", "timeout"] }
 tokio = { version = "1.37.0", features = ["rt-multi-thread", "signal", "macros", "net", "io-util"] }
-axum = { version = "0.7" }
+axum = { version = "0.7.5" }

README.md

@@ -2,7 +2,6 @@
 
 [<img alt="github" height="20" src="https://img.shields.io/badge/github-zarvd/echoserver-8da0cb?style=for-the-badge&labelColor=555555&logo=github">](https://github.com/zarvd/echoserver)
 [<img alt="crates.io" height="20" src="https://img.shields.io/crates/v/echoserver.svg?style=for-the-badge&color=fc8d62&logo=rust">](https://crates.io/crates/echoserver)
-[<img alt="docs.rs" height="20" src="https://img.shields.io/docsrs/echoserver?style=for-the-badge">](https://docs.rs/echoserver)
 [<img alt="build status" height="20" src="https://img.shields.io/github/actions/workflow/status/zarvd/echoserver/ci.yml?branch=master&style=for-the-badge">](https://github.com/zarvd/echoserver/actions?query%3Amaster)
 [<img alt="dependency status" height="20" src="https://deps.rs/repo/github/zarvd/echoserver/status.svg?style=for-the-badge&t=0">](https://deps.rs/repo/github/zarvd/echoserver)
 

justfile

@@ -1,26 +1,29 @@
-image_repo := "ghcr.io/zarvd/echoserver"
-
 default:
     just --list
 
+# Build the project
 build:
-    cargo build --release
-
-run:
-    cargo run --release
+    cargo build
 
+# Format code with rust
 fmt:
     cargo fmt
 
-test:
-    cargo test --release
+# Run unit tests against the current platform
+unit-test:
+    cargo nextest run
 
+# Lint code with clippy
 lint:
-    cargo clippy --release
+    cargo fmt --all -- --check
+    cargo clippy --all-targets --all-features
 
+# Clean workspace
 clean:
     cargo clean
 
+image_repo := "ghcr.io/zarvd/echoserver"
+# Build docker image
 image tag: clean
     docker buildx build ./ \
         --output=type=docker \

src/http.rs

@@ -48,10 +48,10 @@ pub async fn serve(addr: SocketAddr) -> Result<()> {
 
     let listener = TcpListener::bind(addr)
         .await
-        .expect(&format!("bind HTTP server on {addr}"));
+        .unwrap_or_else(|e| panic!("failed to bind HTTP server on {addr}: {e}"));
     axum::serve(listener, app)
         .await
-        .expect(&format!("serve HTTP server on {addr}"));
+        .unwrap_or_else(|e| panic!("failed to serve HTTP server on {addr}: {e}"));
 
     Ok(())
 }

src/signal.rs

@@ -7,7 +7,7 @@ pub async fn shutdown() {
         () = recv_signal_and_shutdown(SignalKind::terminate()) => {}
     };
 
-    info!("recv signal and shutting down");
+    info!("received signal and shutting down");
 }
 
 async fn recv_signal_and_shutdown(kind: SignalKind) {

src/tcp.rs

@@ -34,15 +34,15 @@ pub async fn serve(addr: SocketAddr) -> Result<()> {
 
     let lis = TcpListener::bind(addr)
         .await
-        .expect(&format!("bind TCP server on {addr}"));
+        .unwrap_or_else(|e| panic!("failed to bind TCP server on {addr}: {e}"));
 
     loop {
         match lis.accept().await {
             Ok((socket, _remote_addr)) => {
                 tokio::spawn(handle(socket));
             }
             Err(e) => {
-                error!("[TCP/{}] Failed to accept new socket: {}", addr, e);
+                error!("[TCP/{addr}] Failed to accept new socket: {e}");
             }
         }
     }

src/udp.rs

@@ -21,7 +21,7 @@ pub async fn serve(addr: SocketAddr) -> Result<()> {
     let socket = Arc::new(
         UdpSocket::bind(addr)
             .await
-            .expect(&format!("bind TCP server on {addr}")),
+            .unwrap_or_else(|e| panic!("failed to bind UDP server on {addr}: {e}")),
     );
 
     loop {
@@ -30,10 +30,10 @@ pub async fn serve(addr: SocketAddr) -> Result<()> {
             Ok((n, remote_addr)) => {
                 handle(socket.clone(), remote_addr, &buf[0..n])
                     .await
-                    .expect(&format!("echo data from UDP server {addr}"));
+                    .unwrap_or_else(|e| panic!("failed to echo data from UDP server {addr}: {e}"));
             }
             Err(e) => {
-                error!("Failed to receive data: {}", e);
+                error!("[UDP/{addr}] Failed to receive data: {e}");
             }
         }
     }