From 1379a900090e59ee05611ddfb3b8842261a761e2 Mon Sep 17 00:00:00 2001 From: Alexander Lyon Date: Tue, 9 Apr 2024 16:39:37 +0100 Subject: [PATCH 1/3] fix: bump MSRV (closes #532) --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/async-stripe.yml | 2 +- Cargo.toml | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index e82b642e6..1594c2b29 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -51,7 +51,7 @@ body: id: language-version attributes: label: Rust version - placeholder: Our MSRV is 1.68.0 + placeholder: Our MSRV is 1.74.0 validations: required: true - type: input diff --git a/.github/workflows/async-stripe.yml b/.github/workflows/async-stripe.yml index 9e9cd68a3..358fa2688 100644 --- a/.github/workflows/async-stripe.yml +++ b/.github/workflows/async-stripe.yml @@ -111,7 +111,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: "1.68.0" + toolchain: "1.74.0" override: true - uses: actions/cache@v2 with: diff --git a/Cargo.toml b/Cargo.toml index c139f836d..cfed6a05f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ name = "async-stripe" version = "0.35.0" description = "API bindings for the Stripe HTTP API" -rust-version = "1.68.0" +rust-version = "1.74.0" authors = [ "Anna Baldwin ", "Kevin Stenerson ", diff --git a/README.md b/README.md index 1b51766f5..49ff67e9d 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ If you don't see the specific version you are on, prefer the next available vers ## MSRV -We currently have `1.68.0` pinned in CI, so any version of rustc newer than that should work. +We currently have `1.74.0` pinned in CI, so any version of rustc newer than that should work. If this is not the case, please open an issue. As a policy, we permit MSRV increases in non-breaking releases. If you have a compelling usecase for bumping it, we are usually open to do so, as long as the rust version is not too new (generally 3 releases). From 03355152970f72961ec899d6046da97eec07c46e Mon Sep 17 00:00:00 2001 From: Julian Wiesler Date: Fri, 26 Apr 2024 17:30:28 +0200 Subject: [PATCH 2/3] workaround: Silence ambiguous_glob_reexports --- src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index c95651479..fa705d4a5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -55,6 +55,8 @@ #![allow(clippy::map_clone, clippy::large_enum_variant)] #![warn(clippy::unwrap_used, clippy::missing_errors_doc, clippy::missing_panics_doc)] #![forbid(unsafe_code)] +// Workaround +#![allow(ambiguous_glob_reexports)] // Give a clear error when a required runtime error is not present. Would be better for this // to be a fatal error preventing emission of further compile errors relating to lack of From baf0b98a60ff335a0760f3d8e785715d36d044f7 Mon Sep 17 00:00:00 2001 From: Julian Wiesler Date: Fri, 26 Apr 2024 17:30:42 +0200 Subject: [PATCH 3/3] fix: Unused import --- src/resources.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/resources.rs b/src/resources.rs index 42ced2ae0..a25a318ad 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -183,7 +183,6 @@ pub use { #[rustfmt::skip] #[cfg(feature = "checkout")] pub use { - checkout::checkout_session_ext::*, generated::checkout::{ checkout_session::*, payment_link::*,