Skip to content

cargo: update all dependencies #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
34 changes: 25 additions & 9 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 @@ -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
Expand Down
78 changes: 46 additions & 32 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: 6 additions & 0 deletions integration-test/bins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion multiboot2-header/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions multiboot2-header/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- updated dependencies
- MSRV is 1.75

## 0.4.0 (2024-05-01)

- added `EndHeaderTag::default()`
Expand Down
2 changes: 1 addition & 1 deletion multiboot2-header/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

Expand Down
2 changes: 1 addition & 1 deletion multiboot2/src/framebuffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
8 changes: 4 additions & 4 deletions multiboot2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
}

Expand Down