Skip to content

Commit 614462c

Browse files
committed
cargo: update all dependencies
1 parent 2ec4cd0 commit 614462c

File tree

6 files changed

+75
-39
lines changed

6 files changed

+75
-39
lines changed

Cargo.lock

Lines changed: 18 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude = [
1010

1111
[workspace.dependencies]
1212
bitflags = "2.6.0"
13-
derive_more = { version = "~0.99", default-features = false, features = ["display"] }
13+
derive_more = { version = "1.0.0", default-features = false, features = ["display"] }
1414
log = { version = "~0.4", default-features = false }
1515

1616
# This way, the "multiboot2" dependency in the multiboot2-header crate can be

integration-test/bins/Cargo.lock

Lines changed: 46 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration-test/bins/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,9 @@ multiboot2 = { path = "../../multiboot2", features = ["builder", "unstable"] }
1818
multiboot2-header = { path = "../../multiboot2-header", features = ["builder", "unstable"] }
1919
good_memory_allocator = "0.1"
2020
util = { path = "./util" }
21+
22+
# This way, the "multiboot2" dependency in the multiboot2-header crate can be
23+
# referenced by version, while still the repository version is used
24+
# transparently during local development.
25+
[patch.crates-io]
26+
multiboot2 = { path = "../../multiboot2" }

multiboot2/src/framebuffer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ impl AsBytes for FramebufferColor {}
324324

325325
/// Error when an unknown [`FramebufferTypeId`] is found.
326326
#[derive(Debug, Copy, Clone, Display, PartialEq, Eq)]
327-
#[display(fmt = "Unknown framebuffer type {}", _0)]
327+
#[display("Unknown framebuffer type {}", _0)]
328328
pub struct UnknownFramebufferType(u8);
329329

330330
#[cfg(feature = "unstable")]

multiboot2/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ pub const MAGIC: u32 = 0x36d76289;
112112
pub enum MbiLoadError {
113113
/// The address is invalid. Make sure that the address is 8-byte aligned,
114114
/// according to the spec.
115-
#[display(fmt = "The address is invalid")]
115+
#[display("The address is invalid")]
116116
IllegalAddress,
117117
/// The total size of the multiboot2 information structure must be not zero
118118
/// and a multiple of 8.
119-
#[display(fmt = "The size of the MBI is unexpected")]
119+
#[display("The size of the MBI is unexpected")]
120120
IllegalTotalSize(u32),
121121
/// Missing end tag. Each multiboot2 boot information requires to have an
122122
/// end tag.
123-
#[display(fmt = "There is no end tag")]
123+
#[display("There is no end tag")]
124124
NoEndTag,
125125
}
126126

0 commit comments

Comments
 (0)