Skip to content

Commit 55b836b

Browse files
committed
cargo: updated all dependencies
1 parent 3df6cd4 commit 55b836b

File tree

8 files changed

+82
-58
lines changed

8 files changed

+82
-58
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ exclude = [
99
]
1010

1111
[workspace.dependencies]
12-
bitflags = "2"
13-
derive_more = { version = "0.99", default-features = false, features = ["display"] }
14-
log = { version = "0.4", default-features = false }
12+
bitflags = "2.0.2"
13+
derive_more = { version = "~0.99", default-features = false, features = ["display"] }
14+
log = { version = "~0.4", default-features = false }
1515

1616
# This way, the "multiboot2" dependency in the multiboot2-header crate can be
1717
# referenced by version, while still the repository version is used

integration-test/bins/Cargo.lock

Lines changed: 49 additions & 25 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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,11 @@ members = [
1010
codegen-units = 1
1111
lto = true
1212

13-
[patch.crates-io]
14-
multiboot2 = { path = "../../multiboot2" }
13+
14+
[workspace.dependencies]
15+
anyhow = { version = "1.0", default-features = false }
16+
log = { version = "0.4", default-features = false }
17+
multiboot2 = { path = "../../multiboot2", features = ["builder", "unstable"] }
18+
multiboot2-header = { path = "../../multiboot2-header", features = ["builder", "unstable"] }
19+
good_memory_allocator = "0.1"
20+
util = { path = "./util" }
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[package]
22
name = "multiboot2_chainloader"
3-
description = "Multiboot chainloader that loads a Multiboot2 payload"
3+
description = "Integrationtest: Multiboot2 chainloader"
44
version = "0.1.0"
55
edition = "2021"
66
publish = false
77

88
[dependencies]
9-
util = { path = "../util" }
10-
multiboot2 = { path = "../../../multiboot2" }
11-
multiboot2-header = { path = "../../../multiboot2-header" }
12-
anyhow = { version = "1.0", default-features = false }
13-
elf_rs = "0.3"
14-
log = { version = "0.4", default-features = false }
15-
good_memory_allocator = "0.1"
9+
anyhow.workspace = true
10+
log.workspace = true
11+
good_memory_allocator.workspace = true
1612
multiboot = "0.8"
13+
multiboot2.workspace = true
14+
multiboot2-header.workspace = true
15+
util.workspace = true
16+
elf_rs = "0.3"
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[package]
22
name = "multiboot2_payload"
3-
description = "Multiboot2 integration test"
3+
description = "Integrationtest: Multiboot2 payload"
44
version = "0.1.0"
55
edition = "2021"
66
publish = false
77

88
[dependencies]
9-
multiboot2 = { path = "../../../multiboot2", features = ["builder", "unstable"] }
10-
util = { path = "../util" }
11-
anyhow = { version = "1.0", default-features = false }
12-
good_memory_allocator = "0.1"
13-
log = { version = "0.4", default-features = false }
9+
anyhow.workspace = true
10+
log.workspace = true
11+
good_memory_allocator.workspace = true
12+
multiboot2.workspace = true
13+
util.workspace = true
1414
x86 = "0.52"

multiboot2-header/Cargo.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,7 @@ builder = ["alloc"]
4040
unstable = []
4141

4242
[dependencies]
43-
# Not yet used.
44-
# bitflags.workspace = true
4543
derive_more.workspace = true
46-
# Not yet used.
47-
# log.workspace = true
48-
49-
# Used for MBI tags.
5044
multiboot2 = { version = "0.19.0", default-features = false }
5145

5246
[package.metadata.docs.rs]

multiboot2/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ log.workspace = true
4949
# bumps from uefi-raw, I restrict this here. Upstream users are likely to have
5050
# two versions of this library in it, which is no problem, as we only use the
5151
# type definition.
52-
uefi-raw = { version = "=0.3", default-features = false }
53-
ptr_meta = { version = "0.2", default-features = false }
52+
uefi-raw = { version = "~0.5", default-features = false }
53+
ptr_meta = { version = "~0.2", default-features = false }
5454

5555
[package.metadata.docs.rs]
5656
all-features = true

0 commit comments

Comments
 (0)