From a5fd57ea131ccabafaf9a23f1bded49bdbbe0eba Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Wed, 10 Dec 2025 13:46:26 +0800 Subject: [PATCH 1/2] minor update --- .github/workflows/auto-merge.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/rust.yml | 4 ++-- Cargo.toml | 32 ++++++++++++++++---------------- src/server/connection/bind.rs | 2 +- src/server/connection/connect.rs | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 9f5c200..15a6010 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -13,7 +13,7 @@ jobs: if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: token: ${{ secrets.GITHUB_TOKEN }} - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9649cf2..f58c957 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ${{ matrix.host_os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable - name: Prepare diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fa40801..3eef5fe 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable - name: rustfmt run: cargo fmt --all -- --check @@ -51,7 +51,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable - name: Check semver if: ${{ !cancelled() }} diff --git a/Cargo.toml b/Cargo.toml index 50c71a7..7252f58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,12 +21,12 @@ server = ["tokio"] tokio = ["dep:tokio", "async-trait"] [dependencies] -async-trait = { version = "0.1", optional = true } -bytes = "1" -percent-encoding = "2" -serde = { version = "1", features = ["derive"], optional = true } -thiserror = "2" -tokio = { version = "1", default-features = false, features = [ +async-trait = { version = "0.1.89", optional = true } +bytes = "1.11.0" +percent-encoding = "2.3.2" +serde = { version = "1.0.228", features = ["derive"], optional = true } +thiserror = "2.0.17" +tokio = { version = "1.48.0", default-features = false, features = [ "net", "io-util", "time", @@ -35,16 +35,16 @@ tokio = { version = "1", default-features = false, features = [ ], optional = true } [dev-dependencies] -clap = { version = "4", features = ["derive"] } -ctrlc2 = { version = "3", features = ["async", "termination"] } -dotenvy = "0.15" -env_logger = "0.11" -hickory-proto = "0.25" -log = "0.4" -moka = { version = "0.12", features = ["future"] } -rand = "0.9" -tokio = { version = "1", features = ["rt-multi-thread"] } -tokio-util = { version = "0.7", features = [] } +clap = { version = "4.5.53", features = ["derive"] } +ctrlc2 = { version = "3.7.3", features = ["async", "termination"] } +dotenvy = "0.15.7" +env_logger = "0.11.8" +hickory-proto = "0.25.2" +log = "0.4.29" +moka = { version = "0.12.11", features = ["future"] } +rand = "0.9.2" +tokio = { version = "1.48.0", features = ["rt-multi-thread"] } +tokio-util = { version = "0.7.17", features = [] } [[example]] name = "demo-client" diff --git a/src/server/connection/bind.rs b/src/server/connection/bind.rs index 67b021b..485a952 100644 --- a/src/server/connection/bind.rs +++ b/src/server/connection/bind.rs @@ -233,7 +233,7 @@ impl Bind { /// Split the connection into a read and a write half. #[inline] - pub fn split(&mut self) -> (ReadHalf, WriteHalf) { + pub fn split(&mut self) -> (ReadHalf<'_>, WriteHalf<'_>) { self.stream.split() } } diff --git a/src/server/connection/connect.rs b/src/server/connection/connect.rs index ea07c4c..58ff616 100644 --- a/src/server/connection/connect.rs +++ b/src/server/connection/connect.rs @@ -69,7 +69,7 @@ impl Connect { impl Connect { /// Returns the read/write half of the stream. #[inline] - pub fn split(&mut self) -> (ReadHalf, WriteHalf) { + pub fn split(&mut self) -> (ReadHalf<'_>, WriteHalf<'_>) { self.stream.split() } From 67a36fe516d68f022c9f776f3eddd79228b88e40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Dec 2025 05:47:27 +0000 Subject: [PATCH 2/2] Bump actions/checkout from 4 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/auto-merge.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/rust.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 15a6010..f10844d 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -13,7 +13,7 @@ jobs: if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: token: ${{ secrets.GITHUB_TOKEN }} - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f58c957..5bfd6eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ${{ matrix.host_os }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: dtolnay/rust-toolchain@stable - name: Prepare diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3eef5fe..2d79468 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: dtolnay/rust-toolchain@stable - name: rustfmt run: cargo fmt --all -- --check @@ -51,7 +51,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: dtolnay/rust-toolchain@stable - name: Check semver if: ${{ !cancelled() }}