diff --git a/Cargo.lock b/Cargo.lock index 50fac89a40e..7a971039781 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,7 +273,7 @@ dependencies = [ "anyhow", "base64", "bytesize", - "cargo-platform 0.1.3", + "cargo-platform 0.1.4", "cargo-test-macro", "cargo-test-support", "cargo-util", @@ -386,7 +386,7 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" dependencies = [ "serde", ] @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "core-foundation", diff --git a/Cargo.toml b/Cargo.toml index 75adda4ca1f..2e63ce6bddf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,16 +10,20 @@ exclude = [ "target/", # exclude bench testing ] +[workspace.package] +edition = "2021" +license = "MIT OR Apache-2.0" + [workspace.dependencies] anyhow = "1.0.47" base64 = "0.21.0" bytesize = "1.0" cargo = { path = "" } cargo-credential = { version = "0.2.0", path = "credential/cargo-credential" } -cargo-platform = { path = "crates/cargo-platform", version = "0.1.3" } +cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" } cargo-test-macro = { path = "crates/cargo-test-macro" } cargo-test-support = { path = "crates/cargo-test-support" } -cargo-util = { version = "0.2.4", path = "crates/cargo-util" } +cargo-util = { version = "0.2.5", path = "crates/cargo-util" } cargo_metadata = "0.14.0" clap = "4.2.0" core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] } @@ -96,12 +100,11 @@ windows-sys = "0.48" [package] name = "cargo" version = "0.74.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true homepage = "https://crates.io" repository = "https://github.com/rust-lang/cargo" documentation = "https://docs.rs/cargo" -readme = "README.md" description = """ Cargo, a package manager for Rust. """ diff --git a/benches/benchsuite/Cargo.toml b/benches/benchsuite/Cargo.toml index 782e6c101b4..c15798787cc 100644 --- a/benches/benchsuite/Cargo.toml +++ b/benches/benchsuite/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "benchsuite" version = "0.0.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true homepage = "https://github.com/rust-lang/cargo" repository = "https://github.com/rust-lang/cargo" description = "Benchmarking suite for Cargo." diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml index 6319a0130d4..e42fe70e282 100644 --- a/benches/capture/Cargo.toml +++ b/benches/capture/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "capture" version = "0.1.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true description = "Tool for capturing a real-world workspace for benchmarking." publish = false diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml index 423cf491d25..e7f22cf8701 100644 --- a/crates/cargo-platform/Cargo.toml +++ b/crates/cargo-platform/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-platform" -version = "0.1.3" -edition = "2021" -license = "MIT OR Apache-2.0" +version = "0.1.4" +edition.workspace = true +license.workspace = true homepage = "https://github.com/rust-lang/cargo" repository = "https://github.com/rust-lang/cargo" documentation = "https://docs.rs/cargo-platform" diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml index e40602ae3a3..b5da0522f18 100644 --- a/crates/cargo-test-macro/Cargo.toml +++ b/crates/cargo-test-macro/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-test-macro" version = "0.1.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true homepage = "https://github.com/rust-lang/cargo" repository = "https://github.com/rust-lang/cargo" documentation = "https://github.com/rust-lang/cargo" diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 305c809a82d..085041affd1 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-test-support" version = "0.1.0" -license = "MIT OR Apache-2.0" -edition = "2021" +license.workspace = true +edition.workspace = true publish = false [lib] diff --git a/crates/cargo-util/Cargo.toml b/crates/cargo-util/Cargo.toml index f01705fcab4..6c5efba8377 100644 --- a/crates/cargo-util/Cargo.toml +++ b/crates/cargo-util/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-util" -version = "0.2.4" -edition = "2021" -license = "MIT OR Apache-2.0" +version = "0.2.5" +edition.workspace = true +license.workspace = true homepage = "https://github.com/rust-lang/cargo" repository = "https://github.com/rust-lang/cargo" description = "Miscellaneous support code used by Cargo." diff --git a/crates/crates-io/Cargo.toml b/crates/crates-io/Cargo.toml index 034c2fca550..a82b1d126f7 100644 --- a/crates/crates-io/Cargo.toml +++ b/crates/crates-io/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "crates-io" version = "0.37.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = """ Helpers for interacting with crates.io diff --git a/crates/home/Cargo.toml b/crates/home/Cargo.toml index 6c65ecc1840..1692b111d3b 100644 --- a/crates/home/Cargo.toml +++ b/crates/home/Cargo.toml @@ -3,7 +3,7 @@ name = "home" version = "0.5.6" # also update `html_root_url` in `src/lib.rs` authors = ["Brian Anderson "] documentation = "https://docs.rs/home" -edition = "2018" +edition.workspace = true include = [ "/src", "/Cargo.toml", @@ -11,8 +11,7 @@ include = [ "/LICENSE-*", "/README.md", ] -license = "MIT OR Apache-2.0" -readme = "README.md" +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "Shared definitions of home directories." diff --git a/crates/mdman/Cargo.toml b/crates/mdman/Cargo.toml index 812f1393ad7..ba1d4b462bc 100644 --- a/crates/mdman/Cargo.toml +++ b/crates/mdman/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "mdman" version = "0.0.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true description = "Creates a man page page from markdown." publish = false diff --git a/crates/resolver-tests/Cargo.toml b/crates/resolver-tests/Cargo.toml index e0efb9b6d43..5e69d736799 100644 --- a/crates/resolver-tests/Cargo.toml +++ b/crates/resolver-tests/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "resolver-tests" version = "0.0.0" -edition = "2018" +edition.workspace = true publish = false [dependencies] diff --git a/crates/semver-check/Cargo.toml b/crates/semver-check/Cargo.toml index f7b8c7d482f..17e69656609 100644 --- a/crates/semver-check/Cargo.toml +++ b/crates/semver-check/Cargo.toml @@ -2,7 +2,7 @@ name = "semver-check" version = "0.0.0" authors = ["Eric Huss"] -edition = "2021" +edition.workspace = true publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/xtask-build-man/Cargo.toml b/crates/xtask-build-man/Cargo.toml index 6d02aa2c33a..bec10c48ce9 100644 --- a/crates/xtask-build-man/Cargo.toml +++ b/crates/xtask-build-man/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "xtask-build-man" version = "0.0.0" -edition = "2021" +edition.workspace = true publish = false [dependencies] diff --git a/crates/xtask-stale-label/Cargo.toml b/crates/xtask-stale-label/Cargo.toml index af3218e9679..b1f54a2f13d 100644 --- a/crates/xtask-stale-label/Cargo.toml +++ b/crates/xtask-stale-label/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "xtask-stale-label" version = "0.0.0" -edition = "2021" +edition.workspace = true publish = false [dependencies] diff --git a/crates/xtask-unpublished/Cargo.toml b/crates/xtask-unpublished/Cargo.toml index 541a34dea11..570a9a3ba1e 100644 --- a/crates/xtask-unpublished/Cargo.toml +++ b/crates/xtask-unpublished/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "xtask-unpublished" version = "0.0.0" -edition = "2021" +edition.workspace = true publish = false [dependencies] diff --git a/credential/cargo-credential-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml index 8db40e577f4..652d798e122 100644 --- a/credential/cargo-credential-1password/Cargo.toml +++ b/credential/cargo-credential-1password/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-credential-1password" version = "0.2.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "A Cargo credential process that stores tokens in a 1password vault." diff --git a/credential/cargo-credential-gnome-secret/Cargo.toml b/credential/cargo-credential-gnome-secret/Cargo.toml index 63b3e95ccae..98e89a73107 100644 --- a/credential/cargo-credential-gnome-secret/Cargo.toml +++ b/credential/cargo-credential-gnome-secret/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-credential-gnome-secret" version = "0.2.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "A Cargo credential process that stores tokens with GNOME libsecret." diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml index 6311b71dee9..c52e73cb278 100644 --- a/credential/cargo-credential-macos-keychain/Cargo.toml +++ b/credential/cargo-credential-macos-keychain/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-credential-macos-keychain" version = "0.2.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "A Cargo credential process that stores tokens in a macOS keychain." diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml index cd168a8a3ea..e68f230d851 100644 --- a/credential/cargo-credential-wincred/Cargo.toml +++ b/credential/cargo-credential-wincred/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-credential-wincred" version = "0.2.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "A Cargo credential process that stores tokens with Windows Credential Manager." diff --git a/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml index 2addaf5afad..345ab90fdc2 100644 --- a/credential/cargo-credential/Cargo.toml +++ b/credential/cargo-credential/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-credential" version = "0.2.0" -edition = "2021" -license = "MIT OR Apache-2.0" +edition.workspace = true +license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "A library to assist writing Cargo credential helpers."