From d97b9040ae76f59916992e1bca91f4e272642a53 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 23 Oct 2023 19:24:42 +0200 Subject: [PATCH 1/4] Update MSRV to 1.60.0 For the next 0.13.x release, we need a newer MSRV, because the log dependency does not build with 1.59.0 anymore. So we update the MSRV here. Signed-off-by: Matthias Beyer --- .github/workflows/msrv.yml | 12 ++++++------ README.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index eb016d22..88375433 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: rust: - - 1.59.0 + - 1.60.0 - stable - beta - nightly @@ -45,7 +45,7 @@ jobs: strategy: matrix: rust: - - 1.59.0 + - 1.60.0 - stable - beta - nightly @@ -61,14 +61,14 @@ jobs: override: true - name: Run cargo test - if: matrix.rust != 'nightly' && matrix.rust != '1.59.0' + if: matrix.rust != 'nightly' && matrix.rust != '1.60.0' uses: actions-rs/cargo@v1 with: command: test args: --all-features - name: Run cargo test (nightly) - if: matrix.rust == '1.59.0' + if: matrix.rust == '1.60.0' continue-on-error: true uses: actions-rs/cargo@v1 with: @@ -121,7 +121,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.59.0 + toolchain: 1.60.0 override: true components: clippy @@ -138,7 +138,7 @@ jobs: strategy: matrix: rust: - - 1.59.0 + - 1.60.0 - stable steps: diff --git a/README.md b/README.md index 18f0914f..f9fa2e61 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ more usage information. ## MSRV -We currently support Rust 1.56.0 and newer. +We currently support Rust 1.60.0 and newer. ## License From dac422e5a23fbeb3fee00cef58d3f97300950980 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 23 Oct 2023 19:24:42 +0200 Subject: [PATCH 2/4] Update MSRV to 1.61.0 For the next 0.13.x release, we need a newer MSRV, because the pest_meta (transitive) dependency does not build with 1.60.0 anymore. So we update the MSRV here. Signed-off-by: Matthias Beyer --- .github/workflows/msrv.yml | 12 ++++++------ README.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 88375433..29f100dc 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: rust: - - 1.60.0 + - 1.61.0 - stable - beta - nightly @@ -45,7 +45,7 @@ jobs: strategy: matrix: rust: - - 1.60.0 + - 1.61.0 - stable - beta - nightly @@ -61,14 +61,14 @@ jobs: override: true - name: Run cargo test - if: matrix.rust != 'nightly' && matrix.rust != '1.60.0' + if: matrix.rust != 'nightly' && matrix.rust != '1.61.0' uses: actions-rs/cargo@v1 with: command: test args: --all-features - name: Run cargo test (nightly) - if: matrix.rust == '1.60.0' + if: matrix.rust == '1.61.0' continue-on-error: true uses: actions-rs/cargo@v1 with: @@ -121,7 +121,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 + toolchain: 1.61.0 override: true components: clippy @@ -138,7 +138,7 @@ jobs: strategy: matrix: rust: - - 1.60.0 + - 1.61.0 - stable steps: diff --git a/README.md b/README.md index f9fa2e61..1b3df3d4 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ more usage information. ## MSRV -We currently support Rust 1.60.0 and newer. +We currently support Rust 1.61.0 and newer. ## License From 6f08812806b13d2108fda9716f31eed8dd8083e1 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 23 Oct 2023 19:24:42 +0200 Subject: [PATCH 3/4] Update MSRV to 1.63.0 For the next 0.13.x release, we need a newer MSRV, because the rustix (transitive) dependency does not build with 1.61.0 anymore. So we update the MSRV here. Signed-off-by: Matthias Beyer --- .github/workflows/msrv.yml | 12 ++++++------ README.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 29f100dc..b0414c44 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: rust: - - 1.61.0 + - 1.63.0 - stable - beta - nightly @@ -45,7 +45,7 @@ jobs: strategy: matrix: rust: - - 1.61.0 + - 1.63.0 - stable - beta - nightly @@ -61,14 +61,14 @@ jobs: override: true - name: Run cargo test - if: matrix.rust != 'nightly' && matrix.rust != '1.61.0' + if: matrix.rust != 'nightly' && matrix.rust != '1.63.0' uses: actions-rs/cargo@v1 with: command: test args: --all-features - name: Run cargo test (nightly) - if: matrix.rust == '1.61.0' + if: matrix.rust == '1.63.0' continue-on-error: true uses: actions-rs/cargo@v1 with: @@ -121,7 +121,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.61.0 + toolchain: 1.63.0 override: true components: clippy @@ -138,7 +138,7 @@ jobs: strategy: matrix: rust: - - 1.61.0 + - 1.63.0 - stable steps: diff --git a/README.md b/README.md index 1b3df3d4..ed82d679 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ more usage information. ## MSRV -We currently support Rust 1.61.0 and newer. +We currently support Rust 1.63.0 and newer. ## License From afe0b854dade327bb09b4b8a49b4b65cc0663c23 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 19 Jun 2022 17:21:44 +0200 Subject: [PATCH 4/4] Fix clippy: use first() instead of get(0) Signed-off-by: Matthias Beyer (cherry picked from commit 8b2bdfe9a2fc7a6b30bf287f3066f47678996d63) Signed-off-by: Matthias Beyer --- src/error.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/error.rs b/src/error.rs index f955a281..43895eec 100644 --- a/src/error.rs +++ b/src/error.rs @@ -137,7 +137,7 @@ impl ConfigError { fn prepend(self, segment: &str, add_dot: bool) -> Self { let concat = |key: Option| { let key = key.unwrap_or_default(); - let dot = if add_dot && key.as_bytes().get(0).unwrap_or(&b'[') != &b'[' { + let dot = if add_dot && key.as_bytes().first().unwrap_or(&b'[') != &b'[' { "." } else { ""