From 7828fc36434cfc2f7930265fadafe8959c7e6192 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 17:32:00 +0000 Subject: [PATCH 1/4] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [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/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/commit-lint.yml | 4 ++-- .github/workflows/main.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml index eb859a5..e7d6d51 100644 --- a/.github/workflows/commit-lint.yml +++ b/.github/workflows/commit-lint.yml @@ -7,7 +7,7 @@ jobs: block-fixup: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Block fixup commit merge uses: 13rac1/block-fixup-merge-action@v2.0.0 @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-python@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d51f6ba..03758d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install toolchain uses: actions-rs/toolchain@v1 with: @@ -59,7 +59,7 @@ jobs: # Prevent sudden announcement of a new advisory from failing ci: continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: cargo-deny uses: EmbarkStudios/cargo-deny-action@v1 with: @@ -70,7 +70,7 @@ jobs: name: format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: 1.60.0 @@ -96,7 +96,7 @@ jobs: - fd steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install toolchain uses: actions-rs/toolchain@v1 with: @@ -124,7 +124,7 @@ jobs: name: clippy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: 1.60.0 From 65693625497b84e918be378fc2871e59a129cea5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 5 Sep 2023 08:07:46 +0200 Subject: [PATCH 2/4] MSRV: 1.60.0 -> 1.64.0 Signed-off-by: Matthias Beyer --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03758d9..e7f62f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: rust: - - 1.60.0 + - 1.64.0 - stable - beta features: @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 + toolchain: 1.64.0 - run: rustup component add rustfmt - name: cargo-fmt uses: actions-rs/cargo@v1 @@ -88,7 +88,7 @@ jobs: strategy: matrix: rust: - - 1.60.0 + - 1.64.0 - stable - beta features: @@ -127,7 +127,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 + toolchain: 1.64.0 override: true - uses: swatinem/rust-cache@v2 - run: rustup component add clippy From 33e99f2eebf14a48e23809c2d83d37e75ceef144 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 5 Sep 2023 08:12:31 +0200 Subject: [PATCH 3/4] MSRV: 1.64.0 -> 1.70.0 Signed-off-by: Matthias Beyer --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7f62f6..33a306b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: rust: - - 1.64.0 + - 1.70.0 - stable - beta features: @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.64.0 + toolchain: 1.70.0 - run: rustup component add rustfmt - name: cargo-fmt uses: actions-rs/cargo@v1 @@ -88,7 +88,7 @@ jobs: strategy: matrix: rust: - - 1.64.0 + - 1.70.0 - stable - beta features: @@ -127,7 +127,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.64.0 + toolchain: 1.70.0 override: true - uses: swatinem/rust-cache@v2 - run: rustup component add clippy From abe1d5d0e92343e163204cb48fedb761c78b3d17 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 5 Sep 2023 08:19:35 +0200 Subject: [PATCH 4/4] Fix clippy: Do not borrow here Signed-off-by: Matthias Beyer --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b292b69..9635567 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -116,7 +116,7 @@ mod tests { #[cfg(not(feature = "addr_with_port"))] #[test] fn test_cli() { - let args = Cli::try_parse_from(&["test", "--address", "1.2.3.4", "--port", "1234"]); + let args = Cli::try_parse_from(["test", "--address", "1.2.3.4", "--port", "1234"]); assert!(args.is_ok(), "Not ok: {:?}", args.unwrap_err()); let args = args.unwrap(); assert_eq!(args.port.address, "1.2.3.4"); @@ -126,7 +126,7 @@ mod tests { #[cfg(feature = "addr_with_port")] #[test] fn test_cli() { - let args = Cli::try_parse_from(&["test", "--address", "1.2.3.4:8080"]); + let args = Cli::try_parse_from(["test", "--address", "1.2.3.4:8080"]); assert!(args.is_ok(), "Not ok: {:?}", args.unwrap_err()); let args = args.unwrap(); let exp = std::net::SocketAddr::V4(std::net::SocketAddrV4::new(