Skip to content

Commit 6c4a580

Browse files
cargo: Use [workspace.package] to deduplicate metadata
Cargo 1.64 added the ability to inherit package metadata from the root `Cargo.toml` file. Use that to deduplicate a bunch of fields.
1 parent 8b21b16 commit 6c4a580

File tree

6 files changed

+43
-29
lines changed

6 files changed

+43
-29
lines changed

Cargo.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ members = [
1010
"xtask",
1111
]
1212

13+
[workspace.package]
14+
authors = ["The Rust OSDev team"]
15+
categories = ["embedded", "no-std", "api-bindings"]
16+
edition = "2021"
17+
keywords = ["uefi", "efi"]
18+
license = "MPL-2.0"
19+
repository = "https://github.com/rust-osdev/uefi-rs"
20+
rust-version = "1.68"
21+
1322
[patch.crates-io]
1423
uefi = { path = "uefi" }
1524
uefi-macros = { path = "uefi-macros" }

uefi-macros/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "uefi-macros"
33
version = "0.12.0"
4-
authors = ["The Rust OSDev team"]
54
readme = "README.md"
6-
edition = "2021"
75
description = "Procedural macros for the `uefi` crate."
8-
repository = "https://github.com/rust-osdev/uefi-rs"
9-
keywords = ["uefi", "efi"]
10-
categories = ["embedded", "no-std", "api-bindings"]
11-
license = "MPL-2.0"
12-
rust-version = "1.68"
6+
7+
authors.workspace = true
8+
categories.workspace = true
9+
edition.workspace = true
10+
keywords.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
1314

1415
[lib]
1516
proc-macro = true

uefi-raw/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "uefi-raw"
33
version = "0.2.0"
4-
authors = ["The Rust OSDev team"]
54
readme = "README.md"
6-
edition = "2021"
75
description = "Raw UEFI types"
8-
repository = "https://github.com/rust-osdev/uefi-rs"
9-
keywords = ["uefi", "efi"]
10-
categories = ["embedded", "no-std", "api-bindings"]
11-
license = "MPL-2.0"
12-
rust-version = "1.68"
6+
7+
authors.workspace = true
8+
categories.workspace = true
9+
edition.workspace = true
10+
keywords.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
1314

1415
[dependencies]
1516
bitflags = "2.0.0"

uefi-services/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "uefi-services"
33
version = "0.20.0"
4-
authors = ["The Rust OSDev team"]
54
readme = "README.md"
6-
edition = "2021"
75
description = "Higher-level utilities for the `uefi` crate."
8-
repository = "https://github.com/rust-osdev/uefi-rs"
9-
keywords = ["uefi", "efi"]
10-
categories = ["embedded", "no-std", "api-bindings"]
11-
license = "MPL-2.0"
12-
rust-version = "1.68"
6+
7+
authors.workspace = true
8+
categories.workspace = true
9+
edition.workspace = true
10+
keywords.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
1314

1415
[dependencies]
1516
uefi = { version = "0.23.0", features = ["global_allocator"] }

uefi/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "uefi"
33
version = "0.23.0"
4-
authors = ["The Rust OSDev team"]
54
readme = "README.md"
6-
edition = "2021"
75
description = "Safe and easy-to-use wrapper for building UEFI apps."
8-
repository = "https://github.com/rust-osdev/uefi-rs"
9-
keywords = ["uefi", "efi"]
10-
categories = ["embedded", "no-std", "api-bindings"]
11-
license = "MPL-2.0"
12-
rust-version = "1.68"
6+
7+
authors.workspace = true
8+
categories.workspace = true
9+
edition.workspace = true
10+
keywords.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
1314

1415
[features]
1516
default = ["panic-on-logger-errors"]

xtask/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[package]
22
name = "xtask"
33
version = "0.0.0"
4-
edition = "2021"
54
publish = false
65

6+
edition.workspace = true
7+
78
[dependencies]
89
anyhow = "1.0.51"
910
clap = { version = "4.3.0", default-features = false, features = ["derive", "help", "usage", "std"] }

0 commit comments

Comments
 (0)