Merge pull request #197 from rust-osdev/multiboot2-hdr-dev

prepare release multiboot2-header-v0.3.2

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: cargo
     directory: "/"
     schedule:
-      interval: daily
+      interval: weekly
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "*"
@@ -11,7 +11,7 @@ updates:
   - package-ecosystem: cargo
     directory: "/integration-test/bins"
     schedule:
-      interval: daily
+      interval: weekly
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "*"
@@ -19,5 +19,5 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: daily
+      interval: monthly
     open-pull-requests-limit: 10

Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "derive_more"
@@ -38,7 +38,7 @@ dependencies = [
 
 [[package]]
 name = "multiboot2-header"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "derive_more",
  "multiboot2",
@@ -46,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -106,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "uguid"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16dfbd255defbd727b3a30e8950695d2e6d045841ee250ff0f1f7ced17917f8d"
+checksum = "ab14ea9660d240e7865ce9d54ecdbd1cd9fa5802ae6f4512f093c7907e921533"
 
 [[package]]
 name = "unicode-ident"

integration-test/bins/Cargo.lock

@@ -28,9 +28,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "derive_more"
@@ -51,11 +51,11 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "elf_rs"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf723f70efb0373c0b2501d943cf20ac1adbbd8e7c8eef926b2be545e5a33e8"
+checksum = "894d710b6b07dae25ce69f9227ec2ffa3a3f71dc7f071acea3e1928ab4aeafdf"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "num-traits",
 ]
 
@@ -71,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -98,7 +98,7 @@ dependencies = [
 name = "multiboot2"
 version = "0.19.0"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "derive_more",
  "log",
  "ptr_meta",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiboot2-header"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "derive_more",
  "multiboot2",
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
@@ -156,9 +156,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -239,16 +239,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62642516099c6441a5f41b0da8486d5fc3515a0603b0fdaea67b31600e22082e"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "ptr_meta",
  "uguid",
 ]
 
 [[package]]
 name = "uguid"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16dfbd255defbd727b3a30e8950695d2e6d045841ee250ff0f1f7ced17917f8d"
+checksum = "ab14ea9660d240e7865ce9d54ecdbd1cd9fa5802ae6f4512f093c7907e921533"
 
 [[package]]
 name = "unicode-ident"

multiboot2-header/Cargo.toml

@@ -4,7 +4,7 @@ description = """
 Library with type definitions and parsing functions for Multiboot2 headers.
 This library is `no_std` and can be used in bootloaders.
 """
-version = "0.3.1"
+version = "0.3.2"
 authors = [
     "Philipp Schuster <phip1611@gmail.com>"
 ]
@@ -46,7 +46,7 @@ derive_more.workspace = true
 # Not yet used.
 # log.workspace = true
 
-# used for MBI tags
+# Used for MBI tags.
 multiboot2 = { version = "0.19.0", default-features = false }
 
 [package.metadata.docs.rs]

multiboot2-header/Changelog.md

@@ -1,10 +1,18 @@
 # CHANGELOG for crate `multiboot2-header`
 
-## 0.4.0 (2023-09-xx)
-- **BREAKING** MSRV is 1.68.0
+## 0.3.2 (2023-11-30)
+
 - **BREAKING** bumped `multiboot2` dependency to `v0.19.0`
+- the `multiboot2` dependency doesn't pull in the `multiboot2/builder` feature
+  anymore
+- doc update
+
+## 0.3.1 (2023-06-28)
+
+- doc update
 
 ## 0.3.0 (2023-06-23)
+
 - **BREAKING** MSRV is 1.68.0
 - **BREAKING** renamed the `std` feature to `alloc`
 - **BREAKING** bumped `multiboot2` dependency to `v0.16.0`
@@ -17,18 +25,22 @@
   - implement `core::error::Error` for `LoadError`
 
 ## 0.2.0 (2022-05-03)
+
 - **BREAKING** renamed `EntryHeaderTag` to `EntryAddressHeaderTag`
 - **BREAKING** some paths changed from `multiboot2_header::header` to `multiboot2_header::builder`
    -> thus, import paths are much more logically now
 - internal code improvements
 
 ## 0.1.1 (2022-05-02)
+
 - fixed a bug that prevented the usage of the crate in `no_std` environments
 - added a new default `builder`-feature to Cargo which requires the `alloc`-crate
   (this feature can be disabled which will also remove the dependency to the `alloc` crate)
 
 ## 0.1.0 (2021-10-08)
+
 - initial release
 
 ## 0.0.0
+
 Empty release to save the name on crates.io

multiboot2-header/README.md

@@ -3,23 +3,23 @@
 [![crates.io](https://img.shields.io/crates/v/multiboot2-header.svg)](https://crates.io/crates/multiboot2-header)
 [![docs](https://docs.rs/multiboot2-header/badge.svg)](https://docs.rs/multiboot2-header/)
 
-Rust library with type definitions and parsing functions for Multiboot2 headers.
-This library is `no_std` and can be used in bootloaders.
+Rust library with type definitions and parsing functions for Multiboot2 headers,
+as well as a builder to build them at runtime. This library is `no_std` and can
+be used in bootloaders.
 
 What this library is good for:
-- writing a small binary which writes you a valid Multiboot2 header
-  into a file (such as `header.bin`)
+- construct a Multiboot2 header at runtime (constructing one at build-time with
+  macros is not done yet, contributions are welcome!)
+- write a Multiboot2-bootloader that parses a Multiboot2-header
 - understanding Multiboot2 headers better
 - analyze Multiboot2 headers at runtime
 
-What this library is not optimal for:
-- compiling a Multiboot2 header statically into an object file using only Rust code
-
 ## Features and `no_std` Compatibility
+
 This library is always `no_std` without `alloc`. However, the default `builder`-
 feature requires the `alloc`-crate and an `#[global_allocator]` to be available.
 You need the `builder` only if you want to construct new headers at runtime.
-For parsing, this is not relevant, and you can deactivate the default feature.
+For parsing, the feature is not relevant, and you can deactivate it.
 
 ```toml
 # without `builder`-feature (and without `alloc`-crate)
@@ -29,6 +29,7 @@ multiboot2-header = "<latest>"
 ```
 
 ## Example 1: Builder + Parse
+
 ```rust
 use multiboot2_header::builder::{InformationRequestHeaderTagBuilder, Multiboot2HeaderBuilder};
 use multiboot2_header::{HeaderTagFlag, HeaderTagISA, MbiTagType, RelocatableHeaderTag, RelocatableHeaderTagPreference, Multiboot2Header};
@@ -58,17 +59,19 @@ fn main() {
 ```
 
 ## Example 2: Multiboot2 header as static data in Rust file
+
 You can use the builder, construct a Multiboot2 header, write it to a file and include it like this:
 ```
 #[used]
 #[no_mangle]
 #[link_section = ".text.multiboot2_header"]
-static MULTIBOOT2_HDR: &[u8; 64] = include_bytes!("mb2_hdr_dump.bin");
+static MULTIBOOT2_HDR: [u8; 64] = *include_bytes!("mb2_hdr_dump.bin");
 ```
-You may need a special linker script to place this in a LOAD segment with a file offset with less than 32768 bytes.
-See specification.
+You may need a special linker script to place this symbol in the first 32768
+bytes of the ELF. See Multiboot2 specification.
 
 ## MSRV
+
 The MSRV is 1.69.0 stable.
 
 ## License & Contribution

multiboot2-header/src/lib.rs

@@ -1,7 +1,9 @@
-//! Library with type definitions and parsing functions for Multiboot2 headers.
-//! This library is `no_std` and can be used in bootloaders.
+//! Rust library with type definitions and parsing functions for Multiboot2
+//! headers, as well as a builder to build them at runtime. This library is
+//! `no_std` and can be used in bootloaders.
 //!
 //! # Example
+//!
 //! ```rust
 //! use multiboot2_header::builder::{InformationRequestHeaderTagBuilder, HeaderBuilder};
 //! use multiboot2_header::{HeaderTagFlag, HeaderTagISA, MbiTagType, RelocatableHeaderTag, RelocatableHeaderTagPreference, Multiboot2Header};
@@ -31,6 +33,7 @@
 //! ```
 //!
 //! ## MSRV
+//!
 //! The MSRV is 1.69.0 stable.
 
 #![no_std]