Merge pull request #223 from rust-osdev/update

phip1611 · web-flow · commit 77ca0a22dd5f · 2024-08-12T15:56:19.000+02:00
cargo: update all dependencies
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -20,7 +20,7 @@ jobs:
     name: build (msrv)
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.70.0 # MSRV
+      rust-version: 1.75.0 # MSRV
       do-style-check: false
       features: builder
 
@@ -46,7 +46,7 @@ jobs:
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.70.0 # MSRV
+      rust-version: 1.75.0 # MSRV
       do-style-check: false
       rust-target: thumbv7em-none-eabihf
       features: builder
@@ -103,7 +103,7 @@ jobs:
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.70.0 # MSRV
+      rust-version: 1.75.0 # MSRV
       do-style-check: true
       do-test: false
       features: builder
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ exclude = [
 
 [workspace.dependencies]
 bitflags = "2.6.0"
-derive_more = { version = "~0.99", default-features = false, features = ["display"] }
+derive_more = { version = "1.0.0", default-features = false, features = ["display"] }
 log = { version = "~0.4", default-features = false }
 
 # This way, the "multiboot2" dependency in the multiboot2-header crate can be
diff --git a/integration-test/bins/Cargo.lock b/integration-test/bins/Cargo.lock
diff --git a/integration-test/bins/Cargo.toml b/integration-test/bins/Cargo.toml
@@ -18,3 +18,9 @@ multiboot2 = { path = "../../multiboot2", features = ["builder", "unstable"] }
 multiboot2-header = { path = "../../multiboot2-header", features = ["builder", "unstable"] }
 good_memory_allocator = "0.1"
 util = { path = "./util" }
+
+# This way, the "multiboot2" dependency in the multiboot2-header crate can be
+# referenced by version, while still the repository version is used
+# transparently during local development.
+[patch.crates-io]
+multiboot2 = { path = "../../multiboot2" }
diff --git a/multiboot2-header/Cargo.toml b/multiboot2-header/Cargo.toml
@@ -26,7 +26,7 @@ readme = "README.md"
 homepage = "https://github.com/rust-osdev/multiboot2-header"
 repository = "https://github.com/rust-osdev/multiboot2"
 documentation = "https://docs.rs/multiboot2-header"
-rust-version = "1.70"
+rust-version = "1.75"
 
 [[example]]
 name = "minimal"
diff --git a/multiboot2-header/Changelog.md b/multiboot2-header/Changelog.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- updated dependencies
+- MSRV is 1.75
+
 ## 0.4.0 (2024-05-01)
 
 - added `EndHeaderTag::default()`
diff --git a/multiboot2-header/README.md b/multiboot2-header/README.md
@@ -77,7 +77,7 @@ bytes of the ELF. See Multiboot2 specification.
 
 ## MSRV
 
-The MSRV is 1.70.0 stable.
+The MSRV is 1.75.0 stable.
 
 ## License & Contribution
 
diff --git a/multiboot2-header/src/lib.rs b/multiboot2-header/src/lib.rs
@@ -34,7 +34,7 @@
 //!
 //! ## MSRV
 //!
-//! The MSRV is 1.70.0 stable.
+//! The MSRV is 1.75.0 stable.
 
 #![no_std]
 #![cfg_attr(feature = "unstable", feature(error_in_core))]
diff --git a/multiboot2/Cargo.toml b/multiboot2/Cargo.toml
@@ -31,7 +31,7 @@ readme = "README.md"
 homepage = "https://github.com/rust-osdev/multiboot2"
 repository = "https://github.com/rust-osdev/multiboot2"
 documentation = "https://docs.rs/multiboot2"
-rust-version = "1.70"
+rust-version = "1.75"
 
 [features]
 default = ["builder"]
diff --git a/multiboot2/Changelog.md b/multiboot2/Changelog.md
@@ -1,5 +1,10 @@
 # CHANGELOG for crate `multiboot2`
 
+## Unreleased
+
+- updated dependencies
+- MSRV is 1.75
+
 ## 0.20.2 (2024-05-26)
 
 - fix Debug implementation of `EfiMemoryMapTag`
diff --git a/multiboot2/README.md b/multiboot2/README.md
@@ -45,7 +45,7 @@ tag_, which is a tag of type `0` and size `8`.
 
 ## MSRV
 
-The MSRV is 1.70.0 stable.
+The MSRV is 1.75.0 stable.
 
 ## License & Contribution
 
diff --git a/multiboot2/src/framebuffer.rs b/multiboot2/src/framebuffer.rs
@@ -324,7 +324,7 @@ impl AsBytes for FramebufferColor {}
 
 /// Error when an unknown [`FramebufferTypeId`] is found.
 #[derive(Debug, Copy, Clone, Display, PartialEq, Eq)]
-#[display(fmt = "Unknown framebuffer type {}", _0)]
+#[display("Unknown framebuffer type {}", _0)]
 pub struct UnknownFramebufferType(u8);
 
 #[cfg(feature = "unstable")]
diff --git a/multiboot2/src/lib.rs b/multiboot2/src/lib.rs
@@ -33,7 +33,7 @@
 //! ```
 //!
 //! ## MSRV
-//! The MSRV is 1.70.0 stable.
+//! The MSRV is 1.75.0 stable.
 
 #[cfg(feature = "builder")]
 extern crate alloc;
@@ -112,15 +112,15 @@ pub const MAGIC: u32 = 0x36d76289;
 pub enum MbiLoadError {
     /// The address is invalid. Make sure that the address is 8-byte aligned,
     /// according to the spec.
-    #[display(fmt = "The address is invalid")]
+    #[display("The address is invalid")]
     IllegalAddress,
     /// The total size of the multiboot2 information structure must be not zero
     /// and a multiple of 8.
-    #[display(fmt = "The size of the MBI is unexpected")]
+    #[display("The size of the MBI is unexpected")]
     IllegalTotalSize(u32),
     /// Missing end tag. Each multiboot2 boot information requires to have an
     /// end tag.
-    #[display(fmt = "There is no end tag")]
+    #[display("There is no end tag")]
     NoEndTag,
 }
 
