From e710bfd13a436dba8484bc8ae064a9b5c69f578e Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Fri, 28 Jun 2024 15:30:29 +0200 Subject: [PATCH 1/2] Fix lint `unexpected_cfgs` lint in Rust 1.80 --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 824650a..f965c47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,9 @@ all-features = true [features] default = ["unicode-linebreak", "unicode-width", "smawk"] +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] } + [dependencies] hyphenation = { version = "0.8.4", optional = true, features = ["embed_en-us"] } smawk = { version = "0.3.1", optional = true } From 6aef5c4dbe7e0d4f9c9cac48b81d495f0457b2df Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Fri, 28 Jun 2024 15:48:27 +0200 Subject: [PATCH 2/2] Update MSRV to 1.62 due to dependencies --- .github/workflows/build.yml | 11 +++++++++-- .github/workflows/coverage.yml | 1 + Cargo.toml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c6c802..3440839 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,7 @@ jobs: name: Ubuntu runs-on: ubuntu-latest strategy: + fail-fast: false matrix: rust: - stable @@ -66,6 +67,7 @@ jobs: name: Minimum supported Rust version runs-on: ubuntu-latest strategy: + fail-fast: false matrix: features: - no default features @@ -75,8 +77,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install Rust 1.56 # MSRV from Cargo.toml - run: rustup default 1.56 + - name: Find Minimum Support Rust Version + run: | + echo "msrv=$(egrep 'rust-version\s*=\s*"([0-9.]+)"' Cargo.toml | cut -d '"' -f 2)" >> "$GITHUB_ENV" + + - name: Install Rust ${{ env.msrv }} (MSRV) + run: rustup default $msrv - uses: Swatinem/rust-cache@v2 @@ -124,6 +130,7 @@ jobs: name: Fuzz test runs-on: ubuntu-latest strategy: + fail-fast: false matrix: fuzz-target: - fill_first_fit diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 622ac43..1c130027 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -13,6 +13,7 @@ jobs: name: Generate coverage runs-on: ubuntu-latest strategy: + fail-fast: false matrix: features: - no-default-features diff --git a/Cargo.toml b/Cargo.toml index f965c47..a13e01b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ keywords = ["text", "formatting", "wrap", "typesetting", "hyphenation"] categories = ["text-processing", "command-line-interface"] license = "MIT" edition = "2021" -rust-version = "1.56" +rust-version = "1.62" exclude = [".github/", ".gitignore", "benchmarks/", "examples/", "fuzz/", "images/"] [[example]]