From 54c7946245fb0482b32c4c9489533ab521bb69e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 05:45:22 +0000 Subject: [PATCH 1/4] Update validator requirement from 0.16 to 0.17 --- updated-dependencies: - dependency-name: validator dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 69feca7829..96e309af1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ multer = "2.0" paste = "1.0" serde = "1.0" thiserror = "1.0" -validator = "0.16" +validator = "0.17" [dev-dependencies] futures-executor = "0.3.15" @@ -37,4 +37,4 @@ gotham = { version = "0.7", features = ["testing"], default-features = false } percent-encoding = "2.1" pretty_env_logger = "0.5" trybuild = "=1.0.89" -validator = { version = "0.16", features = ["derive"] } +validator = { version = "0.17", features = ["derive"] } From 07c271317e499b17210ba1a13ae1bb6dd1e4a619 Mon Sep 17 00:00:00 2001 From: Dominic Date: Mon, 11 Mar 2024 23:18:57 +0100 Subject: [PATCH 2/4] CI: validator has a broken requirement on darling --- .github/workflows/rust.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 75404acb52..a94a3e7076 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,7 +12,10 @@ jobs: - uses: dtolnay/rust-toolchain@nightly - run: cargo -Z minimal-versions update - - run: cargo update -p lazy_static + - name: Fix -Z minimal-versions + run: | + cargo update -p darling + cargo update -p lazy_static - uses: dtolnay/rust-toolchain@1.63.0 id: rust-toolchain From 3bcc6dfd7e19f1922368426d1b08fa649679cca0 Mon Sep 17 00:00:00 2001 From: Dominic Date: Mon, 11 Mar 2024 23:27:16 +0100 Subject: [PATCH 3/4] Bump MSRV to 1.70 for validator --- .github/workflows/rust.yml | 6 +++--- Cargo.toml | 2 +- README.md | 4 ++-- README.tpl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a94a3e7076..2386d40649 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: cargo update -p darling cargo update -p lazy_static - - uses: dtolnay/rust-toolchain@1.63.0 + - uses: dtolnay/rust-toolchain@1.70.0 id: rust-toolchain - uses: actions/cache@v4 @@ -41,7 +41,7 @@ jobs: - run: cargo -Z minimal-versions update - run: cargo update -p lazy_static - - uses: dtolnay/rust-toolchain@1.63.0 + - uses: dtolnay/rust-toolchain@1.70.0 id: rust-toolchain - uses: actions/cache@v4 @@ -63,7 +63,7 @@ jobs: - uses: dtolnay/rust-toolchain@master id: rust-toolchain with: - toolchain: "1.72" + toolchain: "1.76" - uses: actions/cache@v4 with: diff --git a/Cargo.toml b/Cargo.toml index 96e309af1b..b2d760e951 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ name = "gotham_formdata" version = "0.0.7" authors = ["Dominic Meiser "] edition = "2021" -rust-version = "1.63.0" +rust-version = "1.70.0" description = "Form data parsing for the gotham web framework" keywords = ["gotham", "html", "form", "urlencoded", "multipart"] categories = ["web-programming", "web-programming::http-server"] diff --git a/README.md b/README.md index 32195fa005..59a2840747 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ docs for main - - Rust 1.63+ + + Rust 1.70+ License Apache-2.0 diff --git a/README.tpl b/README.tpl index b3ac706dbe..dbd51cd67f 100644 --- a/README.tpl +++ b/README.tpl @@ -20,8 +20,8 @@ docs for main - - Rust 1.63+ + + Rust 1.70+ License Apache-2.0 From be87b7f3e4d050c8ad354b455080dbe8dc8d60bb Mon Sep 17 00:00:00 2001 From: Dominic Date: Mon, 11 Mar 2024 23:30:09 +0100 Subject: [PATCH 4/4] CI: apply fix to the other run as well --- .github/workflows/rust.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2386d40649..227e39816a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -39,7 +39,10 @@ jobs: - uses: dtolnay/rust-toolchain@nightly - run: cargo -Z minimal-versions update - - run: cargo update -p lazy_static + - name: Fix -Z minimal-versions + run: | + cargo update -p darling + cargo update -p lazy_static - uses: dtolnay/rust-toolchain@1.70.0 id: rust-toolchain