From 226348d57f06214dcf5f938ccfce04dfe05d6c4c Mon Sep 17 00:00:00 2001
From: Philipp Schuster <phip1611@gmail.com>
Date: Thu, 21 Sep 2023 17:00:33 +0200
Subject: [PATCH] multiboot2-header: update deps and raise MSRV from 1.68 to
 1.69

---
 Cargo.lock                       | 15 +--------------
 integration-test/bins/Cargo.lock | 19 +++----------------
 multiboot2-header/Cargo.toml     |  2 +-
 multiboot2-header/Changelog.md   |  6 +++++-
 multiboot2-header/README.md      |  2 +-
 multiboot2-header/src/lib.rs     |  2 +-
 6 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9d54e11..760ec244 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,19 +25,6 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
-[[package]]
-name = "multiboot2"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b624a7b3f704734d98d21455b617607eb7043d4509d1c34bf9e7ff7dd47b31a"
-dependencies = [
- "bitflags",
- "derive_more",
- "log",
- "ptr_meta",
- "uefi-raw",
-]
-
 [[package]]
 name = "multiboot2"
 version = "0.19.0"
@@ -54,7 +41,7 @@ name = "multiboot2-header"
 version = "0.3.1"
 dependencies = [
  "derive_more",
- "multiboot2 0.16.0",
+ "multiboot2",
 ]
 
 [[package]]
diff --git a/integration-test/bins/Cargo.lock b/integration-test/bins/Cargo.lock
index ff272cbd..3b3bba8f 100644
--- a/integration-test/bins/Cargo.lock
+++ b/integration-test/bins/Cargo.lock
@@ -94,19 +94,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "multiboot2"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b624a7b3f704734d98d21455b617607eb7043d4509d1c34bf9e7ff7dd47b31a"
-dependencies = [
- "bitflags 2.4.0",
- "derive_more",
- "log",
- "ptr_meta",
- "uefi-raw",
-]
-
 [[package]]
 name = "multiboot2"
 version = "0.19.0"
@@ -123,7 +110,7 @@ name = "multiboot2-header"
 version = "0.3.1"
 dependencies = [
  "derive_more",
- "multiboot2 0.16.0",
+ "multiboot2",
 ]
 
 [[package]]
@@ -135,7 +122,7 @@ dependencies = [
  "good_memory_allocator",
  "log",
  "multiboot",
- "multiboot2 0.19.0",
+ "multiboot2",
  "multiboot2-header",
  "util",
 ]
@@ -147,7 +134,7 @@ dependencies = [
  "anyhow",
  "good_memory_allocator",
  "log",
- "multiboot2 0.19.0",
+ "multiboot2",
  "util",
  "x86",
 ]
diff --git a/multiboot2-header/Cargo.toml b/multiboot2-header/Cargo.toml
index ba84e644..4a572fb2 100644
--- a/multiboot2-header/Cargo.toml
+++ b/multiboot2-header/Cargo.toml
@@ -47,7 +47,7 @@ derive_more.workspace = true
 # log.workspace = true
 
 # used for MBI tags
-multiboot2 = "0.16.0"
+multiboot2 = "0.19.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/multiboot2-header/Changelog.md b/multiboot2-header/Changelog.md
index 4d0f9bca..379f49f0 100644
--- a/multiboot2-header/Changelog.md
+++ b/multiboot2-header/Changelog.md
@@ -1,9 +1,13 @@
 # CHANGELOG for crate `multiboot2-header`
 
+## 0.4.0 (2023-09-xx)
+- **BREAKING** MSRV is 1.68.0
+- **BREAKING** bumped `multiboot2` dependency to `v0.19.0`
+
 ## 0.3.0 (2023-06-23)
 - **BREAKING** MSRV is 1.68.0
 - **BREAKING** renamed the `std` feature to `alloc`
-- **BREAKING** bumped dependency to `multiboot2@v0.16.0`
+- **BREAKING** bumped `multiboot2` dependency to `v0.16.0`
 - **BREAKING** renamed `MULTIBOOT2_HEADER_MAGIC` to `MAGIC`
 - **BREAKING** renamed `Multiboot2HeaderBuilder` to `HeaderBuilder`
 - **BREAKING** renamed `from_addr` to `load`. The function now consumes a ptr.
diff --git a/multiboot2-header/README.md b/multiboot2-header/README.md
index 6110293e..42446acf 100644
--- a/multiboot2-header/README.md
+++ b/multiboot2-header/README.md
@@ -69,7 +69,7 @@ You may need a special linker script to place this in a LOAD segment with a file
 See specification.
 
 ## MSRV
-The MSRV is 1.68.0 stable.
+The MSRV is 1.69.0 stable.
 
 ## License & Contribution
 
diff --git a/multiboot2-header/src/lib.rs b/multiboot2-header/src/lib.rs
index 4995b028..929ca27c 100644
--- a/multiboot2-header/src/lib.rs
+++ b/multiboot2-header/src/lib.rs
@@ -31,7 +31,7 @@
 //! ```
 //!
 //! ## MSRV
-//! The MSRV is 1.68.0 stable.
+//! The MSRV is 1.69.0 stable.
 
 #![no_std]
 #![cfg_attr(feature = "unstable", feature(error_in_core))]