From e07c658889e20da706f1d881492e310a34815fcf Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Thu, 12 Feb 2026 15:45:48 +0000
Subject: [PATCH] Set MSRV to 1.84 and set resolver = 3

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/clippy.yml  | 2 +-
 .github/workflows/rustfmt.yml | 2 +-
 CHANGELOG.md                  | 3 ++-
 Cargo.toml                    | 5 +++--
 README.md                     | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9516f8c..4504bf5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.62.0 # MSRV
+          - 1.84.0 # MSRV
 
         features:
           - ''
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 337d411..7a4e5d3 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -17,6 +17,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.71.0
+          toolchain: 1.84.0
           components: clippy
       - run: cargo clippy --all-targets --all-features
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index 9c59703..2b3dc2f 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -15,6 +15,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.71.0
+          toolchain: 1.84.0
           components: rustfmt
       - run: cargo fmt --all -- --check
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa768dd..6c61c14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Changed
-- Raised MSRV to 1.62.0
+- Raised MSRV to 1.84.0
+- Set `resolver = "3"`, which implies `resolver.incompatible-rust-versions = "fallback"`
 
 ## [v1.1.0] - 2023-03-07
 
diff --git a/Cargo.toml b/Cargo.toml
index e23d09f..ff700a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,10 +11,11 @@ documentation = "https://docs.rs/nb"
 readme = "README.md"
 version = "1.1.0"
 edition = "2018"
-rust-version = "1.62"
+rust-version = "1.84"
+resolver = "3"
 
 [features]
 "defmt-0-3" = ["dep:defmt"]
 
 [dependencies]
-defmt = {version = "0.3", optional = true}
\ No newline at end of file
+defmt = {version = "0.3", optional = true}
diff --git a/README.md b/README.md
index efc056b..76ad3ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![crates.io](https://img.shields.io/crates/d/nb.svg)](https://crates.io/crates/nb)
 [![crates.io](https://img.shields.io/crates/v/nb.svg)](https://crates.io/crates/nb)
 [![Documentation](https://docs.rs/nb/badge.svg)](https://docs.rs/nb)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.62+-blue.svg)
+![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.64+-blue.svg)
 
 # `nb`
 
@@ -40,7 +40,7 @@ non-blocking models:
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.62 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.64 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License