From 7dcafe3aadbd4640b393709ab6736a107041d227 Mon Sep 17 00:00:00 2001
From: David Blewett <david.blewett@datadoghq.com>
Date: Fri, 19 Jan 2024 14:58:02 -0500
Subject: [PATCH] Bump MSRV to 1.69.0 to pick up cargo index improvement and
 `CStr::from_bytes_until_nul`

---
 .github/workflows/ci.yml | 2 +-
 Cargo.toml               | 2 +-
 README.md                | 2 +-
 changelog.md             | 1 +
 rdkafka-sys/Cargo.toml   | 2 +-
 rdkafka-sys/build.rs     | 2 +-
 rdkafka-sys/changelog.md | 1 +
 src/lib.rs               | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96708961d..06df67deb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     branches: [master]
 
 env:
-  rust_version: 1.61.0
+  rust_version: 1.69.0
 
 jobs:
   lint:
diff --git a/Cargo.toml b/Cargo.toml
index e190bd18e..064c7ec08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["kafka", "rdkafka"]
 categories = ["api-bindings"]
 edition = "2018"
 exclude = ["Cargo.lock"]
-rust-version = "1.61"
+rust-version = "1.69"
 
 [workspace]
 members = ["rdkafka-sys"]
diff --git a/README.md b/README.md
index 6070ef6a7..cb44723f3 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ re-exported as rdkafka features.
 
 ### Minimum supported Rust version (MSRV)
 
-The current minimum supported Rust version (MSRV) is 1.61.0. Note that
+The current minimum supported Rust version (MSRV) is 1.69.0. Note that
 bumping the MSRV is not considered a breaking change. Any release of
 rust-rdkafka may bump the MSRV.
 
diff --git a/changelog.md b/changelog.md
index 1806d5807..9aeaff9c8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 See also the [rdkafka-sys changelog](rdkafka-sys/changelog.md).
 
 ## Unreleased
+* Bump MSRV to 1.69 to pick up cargo index improvement and `CStr::from_bytes_until_nul`
 
 ## 0.36.2 (2024-01-16)
 
diff --git a/rdkafka-sys/Cargo.toml b/rdkafka-sys/Cargo.toml
index 4870e15b3..ea937216e 100644
--- a/rdkafka-sys/Cargo.toml
+++ b/rdkafka-sys/Cargo.toml
@@ -10,7 +10,7 @@ description = "Native bindings to the librdkafka library"
 keywords = ["kafka", "rdkafka"]
 categories = ["external-ffi-bindings"]
 edition = "2018"
-rust-version = "1.61"
+rust-version = "1.69"
 
 [dependencies]
 num_enum = "0.5.0"
diff --git a/rdkafka-sys/build.rs b/rdkafka-sys/build.rs
index d615744f3..b7c3e42ca 100644
--- a/rdkafka-sys/build.rs
+++ b/rdkafka-sys/build.rs
@@ -77,7 +77,7 @@ fn main() {
         // Ensure that we are in the right directory
         let rdkafkasys_root = Path::new("rdkafka-sys");
         if rdkafkasys_root.exists() {
-            assert!(env::set_current_dir(&rdkafkasys_root).is_ok());
+            assert!(env::set_current_dir(rdkafkasys_root).is_ok());
         }
         if !Path::new("librdkafka/LICENSE").exists() {
             eprintln!("Setting up submodules");
diff --git a/rdkafka-sys/changelog.md b/rdkafka-sys/changelog.md
index 44451c738..f07565790 100644
--- a/rdkafka-sys/changelog.md
+++ b/rdkafka-sys/changelog.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+* Bump MSRV to sync with rdkafka crate
 
 ## v4.7.0+2.2.0 (2023-11-07)
 
diff --git a/src/lib.rs b/src/lib.rs
index 79a8d113f..8854adc92 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -176,7 +176,7 @@
 //!
 //! ### Minimum supported Rust version (MSRV)
 //!
-//! The current minimum supported Rust version (MSRV) is 1.61.0. Note that
+//! The current minimum supported Rust version (MSRV) is 1.69.0. Note that
 //! bumping the MSRV is not considered a breaking change. Any release of
 //! rust-rdkafka may bump the MSRV.
 //!