From fd4923fcea23f4be1549b10533e784b5e4c2817a Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Sat, 24 Aug 2024 13:46:02 +0200 Subject: [PATCH] workspace: dependency updates, bump MSRV --- .github/workflows/rust.yml | 6 +++--- Cargo.lock | 24 ++++++++++++++++++++---- Cargo.toml | 2 +- integration-test/bins/Cargo.lock | 24 ++++++++++++++++++++---- multiboot2-common/CHANGELOG.md | 6 +++++- multiboot2-common/Cargo.toml | 2 +- multiboot2-common/README.md | 2 +- multiboot2-header/CHANGELOG.md | 5 +++++ multiboot2-header/Cargo.toml | 2 +- multiboot2-header/README.md | 2 +- multiboot2-header/src/lib.rs | 2 +- multiboot2/CHANGELOG.md | 6 +++++- multiboot2/Cargo.toml | 4 ++-- multiboot2/README.md | 2 +- multiboot2/src/framebuffer.rs | 2 +- multiboot2/src/lib.rs | 3 +-- 16 files changed, 69 insertions(+), 25 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 70715b72..3c914f55 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,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 @@ -50,7 +50,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 @@ -107,7 +107,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 index 40ee3afd..406ee5b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,13 +10,23 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", "syn 2.0.74", + "unicode-xid", ] [[package]] @@ -118,9 +128,9 @@ dependencies = [ [[package]] name = "uefi-raw" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8716f52e8cab8bcedfd5052388a0f263b69fe5cc2561548dc6a530678333c" +checksum = "7e537b93f83150df09588ca6658e881b2784e8b5f9588f1c7b72a85b72ea71ce" dependencies = [ "bitflags", "ptr_meta", @@ -138,3 +148,9 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" diff --git a/Cargo.toml b/Cargo.toml index 49bd0ea7..efb96173 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ exclude = [ [workspace.dependencies] bitflags = "2.6.0" -derive_more = { version = "~0.99.18", default-features = false, features = ["display"] } +derive_more = { version = "1.0.0", default-features = false, features = ["display"] } log = { version = "~0.4", default-features = false } multiboot2 = { version = "0.22.2", default-features = false } multiboot2-common = { version = "0.1.2", default-features = false } diff --git a/integration-test/bins/Cargo.lock b/integration-test/bins/Cargo.lock index dff4de92..c888c2ec 100644 --- a/integration-test/bins/Cargo.lock +++ b/integration-test/bins/Cargo.lock @@ -34,13 +34,23 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", "syn 2.0.74", + "unicode-xid", ] [[package]] @@ -258,9 +268,9 @@ dependencies = [ [[package]] name = "uefi-raw" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8716f52e8cab8bcedfd5052388a0f263b69fe5cc2561548dc6a530678333c" +checksum = "7e537b93f83150df09588ca6658e881b2784e8b5f9588f1c7b72a85b72ea71ce" dependencies = [ "bitflags 2.6.0", "ptr_meta", @@ -279,6 +289,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + [[package]] name = "util" version = "0.1.0" diff --git a/multiboot2-common/CHANGELOG.md b/multiboot2-common/CHANGELOG.md index d2ecb870..490a0f74 100644 --- a/multiboot2-common/CHANGELOG.md +++ b/multiboot2-common/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog for Crate `multiboot2-common` +## Unreleased + +- dependency updates +- **Breaking:** MSRV is now 1.75 + ## v0.1.2 (2024-08-24) - Documentation improvements -- ## 0.1.0 / 0.1.1 (2024-08-20) diff --git a/multiboot2-common/Cargo.toml b/multiboot2-common/Cargo.toml index 5ea30f70..38f87a20 100644 --- a/multiboot2-common/Cargo.toml +++ b/multiboot2-common/Cargo.toml @@ -20,7 +20,7 @@ readme = "README.md" homepage = "https://github.com/rust-osdev/multiboot2" repository = "https://github.com/rust-osdev/multiboot2" documentation = "https://docs.rs/multiboot2-common" -rust-version = "1.70" +rust-version = "1.75" [features] default = ["builder"] diff --git a/multiboot2-common/README.md b/multiboot2-common/README.md index 7a2282ed..4694864f 100644 --- a/multiboot2-common/README.md +++ b/multiboot2-common/README.md @@ -24,7 +24,7 @@ ABI-compatible rusty types. ## MSRV -The MSRV is 1.70.0 stable. +The MSRV is 1.75.0 stable. ## License & Contribution diff --git a/multiboot2-header/CHANGELOG.md b/multiboot2-header/CHANGELOG.md index d18a5953..5ee009f1 100644 --- a/multiboot2-header/CHANGELOG.md +++ b/multiboot2-header/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for Crate `multiboot2-header` +## Unreleased + +- dependency updates +- **Breaking:** MSRV is now 1.75 + ## v0.5.1 (2024-08-24) - Documentation improvements diff --git a/multiboot2-header/Cargo.toml b/multiboot2-header/Cargo.toml index dc7eadfa..fb9c7064 100644 --- a/multiboot2-header/Cargo.toml +++ b/multiboot2-header/Cargo.toml @@ -29,7 +29,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/README.md b/multiboot2-header/README.md index 724c6a41..170615f6 100644 --- a/multiboot2-header/README.md +++ b/multiboot2-header/README.md @@ -85,7 +85,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 index e2121b68..d4066dca 100644 --- a/multiboot2-header/src/lib.rs +++ b/multiboot2-header/src/lib.rs @@ -23,7 +23,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/CHANGELOG.md b/multiboot2/CHANGELOG.md index 6a875fe4..cbec0eec 100644 --- a/multiboot2/CHANGELOG.md +++ b/multiboot2/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for Crate `multiboot2` +## Unreleased + +- dependency updates +- **Breaking:** MSRV is now 1.75 + ## v0.22.2 (2024-08-24) - Documentation improvements @@ -67,7 +72,6 @@ release and you'll be fine!** references instead of owned values - **Breaking:** The `BoxedDst` has been removed in favor of a normal Rust `Box`. This only affects you if you use the `builder` feature. -- **Breaking:** MSRV is 1.75 - **Breaking:** Introduced new `TagHeader` type as replacement for the `Tag` type that will be changed in the next step. `Tag` has been renamed to an internal-only `GenericTag` type. diff --git a/multiboot2/Cargo.toml b/multiboot2/Cargo.toml index 05ff43cb..97fcdd31 100644 --- a/multiboot2/Cargo.toml +++ b/multiboot2/Cargo.toml @@ -32,7 +32,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"] @@ -51,7 +51,7 @@ multiboot2-common.workspace = true # bumps from uefi-raw, I restrict this here. Upstream users are likely to have # two versions of this library in it, which is no problem, as we only use the # type definition. -uefi-raw = { version = "~0.5", default-features = false } +uefi-raw = { version = "~0.7", default-features = false } [package.metadata.docs.rs] all-features = true diff --git a/multiboot2/README.md b/multiboot2/README.md index 5c15d837..efd4694f 100644 --- a/multiboot2/README.md +++ b/multiboot2/README.md @@ -47,7 +47,7 @@ There are many different types of tags, but they all have the same beginning: ## 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 index 1e480fd6..c81bd080 100644 --- a/multiboot2/src/framebuffer.rs +++ b/multiboot2/src/framebuffer.rs @@ -389,7 +389,7 @@ pub struct 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 index 8027c79a..d5ad47c5 100644 --- a/multiboot2/src/lib.rs +++ b/multiboot2/src/lib.rs @@ -42,7 +42,7 @@ //! ``` //! //! ## MSRV -//! The MSRV is 1.70.0 stable. +//! The MSRV is 1.75.0 stable. #[cfg_attr(feature = "builder", macro_use)] #[cfg(feature = "builder")] @@ -131,7 +131,6 @@ mod tests { /// This test is relevant to give library users flexebility in passing the /// struct around. #[test] - #[allow(clippy::missing_const_for_fn)] // only in Rust 1.70 necessary fn boot_information_is_send_and_sync() { fn accept(_: T) {} let bytes = AlignedBytes([