Skip to content

Commit

Permalink
workspace: dependency updates, bump MSRV
Browse files Browse the repository at this point in the history
  • Loading branch information
phip1611 committed Aug 24, 2024
1 parent b39e2f9 commit fd4923f
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 20 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
24 changes: 20 additions & 4 deletions integration-test/bins/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion multiboot2-common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion multiboot2-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion multiboot2-common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions multiboot2-header/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion multiboot2-header/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion multiboot2-header/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion multiboot2-header/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))]
Expand Down
6 changes: 5 additions & 1 deletion multiboot2/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions multiboot2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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
2 changes: 1 addition & 1 deletion multiboot2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion multiboot2/src/framebuffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
3 changes: 1 addition & 2 deletions multiboot2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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: Send + Sync>(_: T) {}
let bytes = AlignedBytes([
Expand Down

0 comments on commit fd4923f

Please sign in to comment.