From 7e5a246269f2ec4a1bc620bf52b60525db65575e Mon Sep 17 00:00:00 2001 From: jasonwitty Date: Mon, 18 May 2026 16:22:41 -0700 Subject: [PATCH] resolve build failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gt.wittyoneoff.com/jason/socktop-webterm/actions/runs/30 Removed `use std::convert::TryFrom` — redundant in Rust 2021 edition (belt-and-suspenders cleanup) Removed `use std::convert::TryFrom` — redundant in Rust 2021 edition (belt-and-suspenders cleanup) --- .gitea/workflows/build-and-deploy.yaml | 3 +++ Dockerfile | 4 ++-- src/terminado.rs | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yaml b/.gitea/workflows/build-and-deploy.yaml index 9c9f596..c90e776 100644 --- a/.gitea/workflows/build-and-deploy.yaml +++ b/.gitea/workflows/build-and-deploy.yaml @@ -21,6 +21,8 @@ jobs: - name: Set up Rust toolchain uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + cache: false - name: Run tests run: cargo test --all-targets --all-features @@ -36,6 +38,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 with: components: rustfmt, clippy + cache: false - name: Cargo fmt run: cargo fmt --all -- --check diff --git a/Dockerfile b/Dockerfile index ba59007..4526a94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # ============================================================================ # Stage 1: Documentation Builder # ============================================================================ -FROM rust:1.91-slim-bookworm AS docs-builder +FROM rust:1.95-slim-bookworm AS docs-builder WORKDIR /build @@ -36,7 +36,7 @@ RUN cd docs && \ # ============================================================================ # Stage 2: Rust Builder # ============================================================================ -FROM rust:1.91-slim-bookworm AS rust-builder +FROM rust:1.95-slim-bookworm AS rust-builder WORKDIR /build diff --git a/src/terminado.rs b/src/terminado.rs index 7048ee8..035849f 100644 --- a/src/terminado.rs +++ b/src/terminado.rs @@ -3,7 +3,6 @@ use log::error; use libc::c_ushort; -use std::convert::TryFrom; use std::fmt; use serde::ser::SerializeSeq;