From ad2c45bde9e89edd7476520724eb4d44389ae512 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 18 Dec 2023 15:31:24 -0500 Subject: [PATCH 1/2] refactor: clean up package metadata Like PR 12352 but for homepage and repository Versions for * `cargo-credential-1password` * `cargo-util-schemas` * `home` are bumped along with the change. --- Cargo.lock | 6 +++--- Cargo.toml | 4 +++- crates/cargo-platform/Cargo.toml | 4 ++-- crates/cargo-test-macro/Cargo.toml | 4 ++-- crates/cargo-util-schemas/Cargo.toml | 6 +++--- crates/cargo-util/Cargo.toml | 4 ++-- crates/crates-io/Cargo.toml | 3 ++- crates/home/Cargo.toml | 5 +++-- crates/rustfix/Cargo.toml | 4 ++-- credential/cargo-credential-1password/Cargo.toml | 7 ++++--- credential/cargo-credential-libsecret/Cargo.toml | 5 +++-- credential/cargo-credential-macos-keychain/Cargo.toml | 5 +++-- credential/cargo-credential-wincred/Cargo.toml | 5 +++-- credential/cargo-credential/Cargo.toml | 5 +++-- 14 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d15ced84f8..045c01588ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ [[package]] name = "cargo-credential-1password" -version = "0.4.2" +version = "0.4.3" dependencies = [ "cargo-credential", "serde", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "cargo-util-schemas" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "semver", @@ -1914,7 +1914,7 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.10" dependencies = [ "windows-sys 0.52.0", ] diff --git a/Cargo.toml b/Cargo.toml index f91661a5ce6..d7d02d4cde1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,8 @@ exclude = [ rust-version = "1.73" # MSRV:1 edition = "2021" license = "MIT OR Apache-2.0" +homepage = "https://github.com/rust-lang/cargo" +repository = "https://github.com/rust-lang/cargo" [workspace.dependencies] anstream = "0.6.5" @@ -127,7 +129,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true homepage = "https://crates.io" -repository = "https://github.com/rust-lang/cargo" +repository.workspace = true documentation = "https://docs.rs/cargo" description = """ Cargo, a package manager for Rust. diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml index baa17929153..92577ff486e 100644 --- a/crates/cargo-platform/Cargo.toml +++ b/crates/cargo-platform/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.7" edition.workspace = true license.workspace = true rust-version = "1.70.0" # MSRV:3 -homepage = "https://github.com/rust-lang/cargo" -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true documentation = "https://docs.rs/cargo-platform" description = "Cargo's representation of a target platform." diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml index 17ca326f6f2..23a63e9a2cd 100644 --- a/crates/cargo-test-macro/Cargo.toml +++ b/crates/cargo-test-macro/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" rust-version.workspace = true edition.workspace = true license.workspace = true -homepage = "https://github.com/rust-lang/cargo" -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true documentation = "https://github.com/rust-lang/cargo" description = "Helper proc-macro for Cargo's testsuite." publish = false diff --git a/crates/cargo-util-schemas/Cargo.toml b/crates/cargo-util-schemas/Cargo.toml index 24d1801ff4f..32a13c26394 100644 --- a/crates/cargo-util-schemas/Cargo.toml +++ b/crates/cargo-util-schemas/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "cargo-util-schemas" -version = "0.1.0" +version = "0.1.1" rust-version.workspace = true edition.workspace = true license.workspace = true -homepage = "https://github.com/rust-lang/cargo" -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "Deserialization schemas for Cargo" [dependencies] diff --git a/crates/cargo-util/Cargo.toml b/crates/cargo-util/Cargo.toml index 3fd6bdeca17..aa54e93c348 100644 --- a/crates/cargo-util/Cargo.toml +++ b/crates/cargo-util/Cargo.toml @@ -4,8 +4,8 @@ version = "0.2.9" rust-version.workspace = true edition.workspace = true license.workspace = true -homepage = "https://github.com/rust-lang/cargo" -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "Miscellaneous support code used by Cargo." [dependencies] diff --git a/crates/crates-io/Cargo.toml b/crates/crates-io/Cargo.toml index bf2b20cf702..458f62749d8 100644 --- a/crates/crates-io/Cargo.toml +++ b/crates/crates-io/Cargo.toml @@ -4,7 +4,8 @@ version = "0.39.2" rust-version.workspace = true edition.workspace = true license.workspace = true -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = """ Helpers for interacting with crates.io """ diff --git a/crates/home/Cargo.toml b/crates/home/Cargo.toml index 33cd6ba5a95..a0319ddb9f4 100644 --- a/crates/home/Cargo.toml +++ b/crates/home/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "home" -version = "0.5.9" +version = "0.5.10" authors = ["Brian Anderson "] rust-version = "1.70.0" # MSRV:3 documentation = "https://docs.rs/home" @@ -13,7 +13,8 @@ include = [ "/README.md", ] license.workspace = true -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "Shared definitions of home directories." [target.'cfg(windows)'.dependencies] diff --git a/crates/rustfix/Cargo.toml b/crates/rustfix/Cargo.toml index 7947f0268b5..5843cf98bcd 100644 --- a/crates/rustfix/Cargo.toml +++ b/crates/rustfix/Cargo.toml @@ -8,8 +8,8 @@ authors = [ rust-version = "1.70.0" # MSRV:3 edition.workspace = true license.workspace = true -homepage = "https://github.com/rust-lang/cargo" -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "Automatically apply the suggestions made by rustc" documentation = "https://docs.rs/rustfix" exclude = [ diff --git a/credential/cargo-credential-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml index 3024bd497ad..d92756450de 100644 --- a/credential/cargo-credential-1password/Cargo.toml +++ b/credential/cargo-credential-1password/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "cargo-credential-1password" -version = "0.4.2" +version = "0.4.3" +rust-version = "1.70.0" # MSRV:3 edition.workspace = true license.workspace = true -rust-version = "1.70.0" # MSRV:3 -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "A Cargo credential process that stores tokens in a 1password vault." [dependencies] diff --git a/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml index e68c9b83a02..c313f816034 100644 --- a/credential/cargo-credential-libsecret/Cargo.toml +++ b/credential/cargo-credential-libsecret/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "cargo-credential-libsecret" version = "0.4.2" +rust-version.workspace = true edition.workspace = true license.workspace = true -rust-version.workspace = true -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "A Cargo credential process that stores tokens with GNOME libsecret." [dependencies] diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml index 95ffa231fe9..d1905f57d53 100644 --- a/credential/cargo-credential-macos-keychain/Cargo.toml +++ b/credential/cargo-credential-macos-keychain/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "cargo-credential-macos-keychain" version = "0.4.2" +rust-version.workspace = true edition.workspace = true license.workspace = true -rust-version.workspace = true -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "A Cargo credential process that stores tokens in a macOS keychain." [dependencies] diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml index 1ecb2a7be5d..3e4bc86d778 100644 --- a/credential/cargo-credential-wincred/Cargo.toml +++ b/credential/cargo-credential-wincred/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "cargo-credential-wincred" version = "0.4.2" +rust-version.workspace = true edition.workspace = true license.workspace = true -rust-version.workspace = true -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "A Cargo credential process that stores tokens with Windows Credential Manager." [dependencies] diff --git a/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml index 7dc37ff82ac..5bcff983918 100644 --- a/credential/cargo-credential/Cargo.toml +++ b/credential/cargo-credential/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "cargo-credential" version = "0.4.2" +rust-version = "1.70.0" # MSRV:3 edition.workspace = true license.workspace = true -rust-version = "1.70.0" # MSRV:3 -repository = "https://github.com/rust-lang/cargo" +homepage.workspace = true +repository.workspace = true description = "A library to assist writing Cargo credential helpers." [dependencies] From 8a762b89b995b7cb5f1fdcfed02a61614f3f79d8 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 18 Dec 2023 16:08:29 -0500 Subject: [PATCH 2/2] refactor: link homepage to The Cargo Book for main `cargo` crate --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d7d02d4cde1..88a5e0fcc35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,7 +128,7 @@ version = "0.77.0" edition.workspace = true license.workspace = true rust-version.workspace = true -homepage = "https://crates.io" +homepage = "https://doc.rust-lang.org/cargo/index.html" repository.workspace = true documentation = "https://docs.rs/cargo" description = """