From 4b45d361b1b96eb1f37b7d1db2684203ca828a94 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 8 Feb 2024 09:45:17 -0600
Subject: [PATCH] chore: Update MSRV to 1.74

---
 .clippy.toml                                  | 2 +-
 .github/workflows/ci.yml                      | 8 ++++----
 Cargo.toml                                    | 2 +-
 Makefile                                      | 2 +-
 src/lib.rs                                    | 2 +-
 tests/derive_ui.rs                            | 2 +-
 tests/derive_ui/flatten_enum_in_struct.stderr | 8 ++++----
 tests/derive_ui/flatten_struct_in_enum.stderr | 9 ++++-----
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.clippy.toml b/.clippy.toml
index e88edc91fd7..68e430e2b31 100644
--- a/.clippy.toml
+++ b/.clippy.toml
@@ -1,4 +1,4 @@
-msrv = "1.70.0"  # MSRV
+msrv = "1.74"  # MSRV
 warn-on-all-wildcard-imports = true
 allow-expect-in-tests = true
 allow-unwrap-in-tests = true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c74b586d74..56e522f6cd4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
         build: [msrv, wasm, wasm-wasi, debug, release]
         include:
           - build: msrv
-            rust: 1.70.0  # MSRV
+            rust: "1.74"  # MSRV
             target: x86_64-unknown-linux-gnu
             features: full
           - build: wasm
@@ -129,7 +129,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: "1.70"  # MSRV
+        toolchain: "1.74"  # MSRV
     - uses: Swatinem/rust-cache@v2
     - name: UI Tests
       run: make test-ui-${{ matrix.features }}
@@ -154,7 +154,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: 1.70.0  # MSRV
+        toolchain: "1.74"  # MSRV
     - uses: Swatinem/rust-cache@v2
     - name: Check documentation
       env:
@@ -185,7 +185,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: "1.70"  # MSRV
+        toolchain: "1.74"  # MSRV
         components: clippy
     - uses: Swatinem/rust-cache@v2
     - name: Lint (ultra-minimal)
diff --git a/Cargo.toml b/Cargo.toml
index c930642d69e..1fc5e8b5070 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ members = [
 [workspace.package]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.70.0"  # MSRV
+rust-version = "1.74"  # MSRV
 include = [
   "build.rs",
   "src/**/*",
diff --git a/Makefile b/Makefile
index 1574009e2e1..febac2ead38 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
   ARGS+=--target ${TOOLCHAIN_TARGET}
 endif
 
-MSRV?=1.70
+MSRV?=1.74
 
 _FEATURES = minimal default wasm full debug release
 _FEATURES_minimal = --no-default-features --features "std"
diff --git a/src/lib.rs b/src/lib.rs
index 9508cbd3d35..ddb6d993ee4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,7 +26,7 @@
 //!   - Leverage feature flags to keep to one active branch
 //!   - Being under [WG-CLI](https://github.com/rust-cli/team/) to increase the bus factor
 //! - We follow semver and will wait about 6-9 months between major breaking changes
-//! - We will support the last two minor Rust releases (MSRV, currently 1.70.0)
+//! - We will support the last two minor Rust releases (MSRV, currently 1.74)
 //!
 //! While these aspirations can be at odds with fast build times and low binary
 //! size, we will still strive to keep these reasonable for the flexibility you
diff --git a/tests/derive_ui.rs b/tests/derive_ui.rs
index 5d4acac49bc..85156a30822 100644
--- a/tests/derive_ui.rs
+++ b/tests/derive_ui.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 
 #[cfg(feature = "derive")]
-#[rustversion::attr(any(not(stable), before(1.70), since(1.71)), ignore)] // MSRV
+#[rustversion::attr(any(not(stable), before(1.74), since(1.75)), ignore)] // MSRV
 #[test]
 fn ui() {
     let t = trybuild::TestCases::new();
diff --git a/tests/derive_ui/flatten_enum_in_struct.stderr b/tests/derive_ui/flatten_enum_in_struct.stderr
index fd0e39543a0..0bff54fff7c 100644
--- a/tests/derive_ui/flatten_enum_in_struct.stderr
+++ b/tests/derive_ui/flatten_enum_in_struct.stderr
@@ -1,9 +1,9 @@
 error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied
- --> tests/derive_ui/flatten_enum_in_struct.rs:3:15
+ --> tests/derive_ui/flatten_enum_in_struct.rs:4:10
   |
-3 |     #[command(flatten)]
-  |               ^^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
+4 |     sub: SubCmd,
+  |          ^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
   |
   = help: the following other types implement trait `clap::Args`:
-            Box<T>
             Opt
+            Box<T>
diff --git a/tests/derive_ui/flatten_struct_in_enum.stderr b/tests/derive_ui/flatten_struct_in_enum.stderr
index fb7f322249c..8bc814ac52c 100644
--- a/tests/derive_ui/flatten_struct_in_enum.stderr
+++ b/tests/derive_ui/flatten_struct_in_enum.stderr
@@ -1,10 +1,9 @@
 error[E0277]: the trait bound `SubCmd: Subcommand` is not satisfied
- --> tests/derive_ui/flatten_struct_in_enum.rs:1:10
+ --> tests/derive_ui/flatten_struct_in_enum.rs:4:9
   |
-1 | #[derive(clap::Parser)]
-  |          ^^^^^^^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
+4 |     Sub(SubCmd),
+  |         ^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
   |
   = help: the following other types implement trait `Subcommand`:
-            Box<T>
             Opt
-  = note: this error originates in the derive macro `clap::Parser` (in Nightly builds, run with -Z macro-backtrace for more info)
+            Box<T>