Skip to content
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.

Sign up for GitHub

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

Jump to bottom

workspace package metadata #1036

Merged
merged 9 commits into from
May 31, 2024
Merged

workspace package metadata #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b68e5e
chore: remove `Cargo.toml` `documentation` field
gibbz00 Apr 21, 2024
cb17a54
chore: use cargo manifest `workspace.package.authors`
gibbz00 Apr 21, 2024
6acdceb
chore: use cargo manifest `workspace.package.repository`
gibbz00 Apr 21, 2024
d3d0952
chore: use cargo manifest `workspace.package.license`
gibbz00 Apr 21, 2024
00c0025
chore: use cargo manifest `workspace.package.rust-version`
gibbz00 Apr 21, 2024
b24bfe1
chore: use cargo manifest `workspace.package.edition`:
gibbz00 Apr 21, 2024
14115c8
chore: use cargo manifest `workspace.package.version`
gibbz00 Apr 21, 2024
d569eb3
chore: group cargo workspace package metadata usage
gibbz00 Apr 21, 2024
d8b26b9
chore: use `workspace.edition` for remaining 2021 edition crates
gibbz00 May 29, 2024
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
13 changes: 13 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,18 @@ exclude = [

resolver = "2"

[workspace.package]
version = "0.12.6"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Lucio Franco <luciofranco14@gmail.com>",
"Casper Meijn <casper@meijn.net>",
"Tokio Contributors <team@tokio.rs>",
]
license = "Apache-2.0"
repository = "https://github.com/tokio-rs/prost"
rust-version = "1.70"
edition = "2021"

[profile.bench]
debug = true
7 changes: 2 additions & 5 deletions conformance/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "conformance"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2021"
edition.workspace = true
authors.workspace = true

[dependencies]
bytes = "1"
Expand Down
7 changes: 2 additions & 5 deletions fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "fuzz"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2021"
edition.workspace = true
authors.workspace = true

[package.metadata]
cargo-fuzz = true
Expand Down
18 changes: 6 additions & 12 deletions prost-build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
[package]
name = "prost-build"
version = "0.12.6"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Lucio Franco <luciofranco14@gmail.com>",
"Casper Meijn <casper@meijn.net>",
"Tokio Contributors <team@tokio.rs>",
]
license = "Apache-2.0"
repository = "https://github.com/tokio-rs/prost"
documentation = "https://docs.rs/prost-build"
gibbz00 marked this conversation as resolved.
Show resolved Hide resolved
readme = "README.md"
description = "Generate Prost annotated Rust types from Protocol Buffers files."
edition = "2021"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should only centralize values that are the same for all crates. It can be confusing when the edition is set at the workspace level, but different for other crates.

So we should update the edition of the other crates before doing this commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate PR: #1039

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that the private projects have the same edition, then can also use the workspace.edition.

rust-version = "1.70"
version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true

[features]
default = ["format"]
Expand Down
18 changes: 6 additions & 12 deletions prost-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
[package]
name = "prost-derive"
version = "0.12.6"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Lucio Franco <luciofranco14@gmail.com>",
"Casper Meijn <casper@meijn.net>",
"Tokio Contributors <team@tokio.rs>",
]
license = "Apache-2.0"
repository = "https://github.com/tokio-rs/prost"
documentation = "https://docs.rs/prost-derive"
readme = "README.md"
description = "Generate encoding and decoding implementations for Prost annotated types."
edition = "2021"
rust-version = "1.70"
version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true

[lib]
proc_macro = true
Expand Down
18 changes: 6 additions & 12 deletions prost-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
[package]
name = "prost-types"
version = "0.12.6"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Lucio Franco <luciofranco14@gmail.com>",
"Casper Meijn <casper@meijn.net>",
"Tokio Contributors <team@tokio.rs>",
]
license = "Apache-2.0"
repository = "https://github.com/tokio-rs/prost"
documentation = "https://docs.rs/prost-types"
readme = "README.md"
description = "Prost definitions of Protocol Buffers well known types."
edition = "2021"
rust-version = "1.70"
version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true

[lib]
doctest = false
Expand Down
18 changes: 6 additions & 12 deletions prost/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
[package]
name = "prost"
version = "0.12.6"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Lucio Franco <luciofranco14@gmail.com>",
"Casper Meijn <casper@meijn.net>",
"Tokio Contributors <team@tokio.rs>",
]
license = "Apache-2.0"
repository = "https://github.com/tokio-rs/prost"
documentation = "https://docs.rs/prost"
readme = "README.md"
description = "A Protocol Buffers implementation for the Rust Language."
keywords = ["protobuf", "serialization"]
categories = ["encoding"]
edition = "2021"
rust-version = "1.70"
version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true

[lib]
# https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
Expand Down
7 changes: 2 additions & 5 deletions protobuf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "protobuf"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2021"
edition.workspace = true
authors.workspace = true

[dependencies]
prost = { path = "../prost" }
Expand Down
5 changes: 1 addition & 4 deletions tests-2015/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "tests-2015"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2015"
authors.workspace = true

build = "../tests/src/build.rs"

Expand Down
7 changes: 2 additions & 5 deletions tests-no-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "tests-no-std"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2021"
edition.workspace = true
authors.workspace = true

build = "../tests/src/build.rs"

Expand Down
7 changes: 2 additions & 5 deletions tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[package]
name = "tests"
version = "0.0.0"
authors = [
"Dan Burkert <dan@danburkert.com>",
"Tokio Contributors <team@tokio.rs>",
]
publish = false
edition = "2021"
edition.workspace = true
authors.workspace = true

build = "src/build.rs"

Expand Down
Loading