Test with minimal versions; Lower MSRV to 1.60 (#54)

msrd0 · Sep 12, 2023 · 54e4106 · 54e4106
1 parent 50b8dd6
commit 54e4106
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -9,17 +9,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/[email protected]
+
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo -Z minimal-versions update
+      - run: cargo update -p lazy_static
+
+      - uses: dtolnay/[email protected]
         id: rust-toolchain
 
       - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo
             target
-          key: ${{ runner.os }}-cargo-${{steps.rust-toolchain.outputs.cachekey}}
+          key: ${{runner.os}}-cargo-${{steps.rust-toolchain.outputs.cachekey}}
 
-      - run: cargo test -- --skip trybuild_ui
+      - run: cargo test --locked -- --skip trybuild_ui
         env:
           RUST_BACKTRACE: 1
           RUST_LOG: info
@@ -28,7 +33,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/[email protected]
+
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo -Z minimal-versions update
+      - run: cargo update -p lazy_static
+
+      - uses: dtolnay/[email protected]
         id: rust-toolchain
 
       - uses: actions/cache@v3
@@ -38,7 +48,7 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-${{steps.rust-toolchain.outputs.cachekey}}
 
-      - run: cargo test --no-default-features --lib --tests -- --skip trybuild_ui
+      - run: cargo test --locked --no-default-features --lib --tests -- --skip trybuild_ui
         env:
           RUST_BACKTRACE: 1
           RUST_LOG: info
@@ -50,7 +60,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         id: rust-toolchain
         with:
-          toolchain: "1.69"
+          toolchain: "1.72"
 
       - uses: actions/cache@v3
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ name = "gotham_formdata"
 version = "0.0.7"
 authors = ["Dominic Meiser <[email protected]>"]
 edition = "2021"
-rust-version = "1.65.0"
+rust-version = "1.60.0"
 description = "Form data parsing for the gotham web framework"
 keywords = ["gotham", "html", "form", "urlencoded", "multipart"]
 categories = ["web-programming", "web-programming::http-server"]
@@ -21,7 +21,7 @@ include = ["src/**", "Cargo.toml", "LICENSE", "README.md"]
 bytes = "1.0"
 form_urlencoded = "1.0"
 futures-util = "0.3.15"
-gotham = { version = "0.7", default-features = false }
+gotham = { version = "0.7.2", default-features = false }
 gotham_formdata_derive = { version = "0.0.7", path = "derive/" }
 log = "0.4"
 mime = "0.3.16"

diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@
 	<a href="https://msrd0.github.io/gotham_formdata/doc/gotham_formdata/index.html">
 		<img alt="docs for main" src="https://img.shields.io/badge/docs-main-blue.svg"/>
 	</a>
-	<a href="https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html">
-		<img alt="Rust 1.65+" src="https://img.shields.io/badge/rustc-1.65+-orange.svg"/>
+	<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
+		<img alt="Rust 1.60+" src="https://img.shields.io/badge/rustc-1.60+-orange.svg"/>
 	</a>
 	<a href="https://www.apache.org/licenses/LICENSE-2.0">
 		<img alt="License Apache-2.0" src="https://img.shields.io/badge/license-Apache--2.0-blue.svg"/>

diff --git a/README.tpl b/README.tpl
@@ -20,8 +20,8 @@
 	<a href="https://msrd0.github.io/gotham_formdata/doc/gotham_formdata/index.html">
 		<img alt="docs for main" src="https://img.shields.io/badge/docs-main-blue.svg"/>
 	</a>
-	<a href="https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html">
-		<img alt="Rust 1.65+" src="https://img.shields.io/badge/rustc-1.65+-orange.svg"/>
+	<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
+		<img alt="Rust 1.60+" src="https://img.shields.io/badge/rustc-1.60+-orange.svg"/>
 	</a>
 	<a href="https://www.apache.org/licenses/LICENSE-2.0">
 		<img alt="License Apache-2.0" src="https://img.shields.io/badge/license-Apache--2.0-blue.svg"/>

diff --git a/tests/ui/form_data_unparsable.stderr b/tests/ui/form_data_unparsable.stderr
@@ -5,14 +5,14 @@ error[E0277]: the trait bound `for<'de> MyType: serde::de::Deserialize<'de>` is
    |                       ^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `MyType`
    |
    = help: the following other types implement trait `serde::de::Deserialize<'de>`:
-             &'a Path
-             &'a [u8]
-             &'a str
-             ()
-             (T0, T1)
-             (T0, T1, T2)
-             (T0, T1, T2, T3)
-             (T0, T1, T2, T3, T4)
+             bool
+             char
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
            and $N others
    = note: required for `MyType` to implement `serde::de::DeserializeOwned`
    = note: required for `Value<'gotham_formdata_value, gotham_formdata::Error>` to implement `for<'gotham_formdata_value> Parse<MyType>`