diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6c9eb137..e0a81671 100644 --- 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 index 0022eb84..6e378ffe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,20 +10,30 @@ 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.65", + "syn 2.0.74", + "unicode-xid", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "multiboot2" @@ -46,9 +56,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -95,9 +105,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.65" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -126,3 +136,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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" diff --git a/Cargo.toml b/Cargo.toml index 76c7c806..e5eacb6c 100644 --- 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 index 261b0100..d87a36f5 100644 --- a/integration-test/bins/Cargo.lock +++ b/integration-test/bins/Cargo.lock @@ -28,26 +28,36 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "derive_more" -version = "0.99.17" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +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", + "syn 2.0.74", + "unicode-xid", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elf_rs" @@ -55,7 +65,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "894d710b6b07dae25ce69f9227ec2ffa3a3f71dc7f071acea3e1928ab4aeafdf" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "num-traits", ] @@ -81,9 +91,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "multiboot" @@ -96,22 +106,9 @@ dependencies = [ [[package]] name = "multiboot2" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d67e1b461b49127f2226c78a2b4090f72212c44fa27342bcfef93dd39bd6b86" -dependencies = [ - "bitflags 2.5.0", - "derive_more", - "log", - "ptr_meta", - "uefi-raw", -] - -[[package]] -name = "multiboot2" -version = "0.20.1" +version = "0.20.2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "derive_more", "log", "ptr_meta", @@ -123,7 +120,7 @@ name = "multiboot2-header" version = "0.4.0" dependencies = [ "derive_more", - "multiboot2 0.20.0", + "multiboot2", ] [[package]] @@ -135,7 +132,7 @@ dependencies = [ "good_memory_allocator", "log", "multiboot", - "multiboot2 0.20.1", + "multiboot2", "multiboot2-header", "util", ] @@ -147,7 +144,7 @@ dependencies = [ "anyhow", "good_memory_allocator", "log", - "multiboot2 0.20.1", + "multiboot2", "util", "x86", ] @@ -169,9 +166,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -193,7 +190,7 @@ checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -246,13 +243,24 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "uefi-raw" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efa8716f52e8cab8bcedfd5052388a0f263b69fe5cc2561548dc6a530678333c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "ptr_meta", "uguid", ] @@ -269,6 +277,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + [[package]] name = "util" version = "0.1.0" diff --git a/integration-test/bins/Cargo.toml b/integration-test/bins/Cargo.toml index ddd6e60e..335dd53f 100644 --- 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 index 0fd73855..e94b20e7 100644 --- 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 index 693d8662..55986349 100644 --- 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 index eebac8d0..577a75a8 100644 --- 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 index 456f4682..165bace8 100644 --- 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 index 152d34d2..4a7732de 100644 --- 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 index 89055385..f949feaa 100644 --- 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 index 4bdd1893..52a207e5 100644 --- 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 index bb80dc25..5a92b8c4 100644 --- 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 index af37b5b7..f9b07f35 100644 --- 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, }