From 895435fba9baf1baf22fdcafa50535fc5bc7bdb5 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 18 Apr 2023 20:02:21 -0500 Subject: [PATCH] chore: Use globs for workspace members This is a short-term option until we can have a better solution for globbing. This does not update `benches/` to support which has a README in there preventing globbing; this seems low-churn enough not to find a solution for it. On the next sync-up with rust-lang/rust, we'll need to update https://github.com/rust-lang/rust/blob/4e463012580415a932ae4fc255aff45982c70369/src/bootstrap/tool.rs#L588-L603 Fixes #11988 --- Cargo.toml | 11 ++--------- {crates/credential => credential}/README.md | 0 .../cargo-credential-1password/Cargo.toml | 0 .../cargo-credential-1password/src/main.rs | 0 .../cargo-credential-gnome-secret/Cargo.toml | 0 .../cargo-credential-gnome-secret/build.rs | 0 .../cargo-credential-gnome-secret/src/main.rs | 0 .../cargo-credential-macos-keychain/Cargo.toml | 0 .../cargo-credential-macos-keychain/src/main.rs | 0 .../cargo-credential-wincred/Cargo.toml | 0 .../cargo-credential-wincred/src/main.rs | 0 .../cargo-credential/Cargo.toml | 0 .../cargo-credential/README.md | 2 +- .../cargo-credential/src/lib.rs | 0 src/cargo/lib.rs | 2 +- triagebot.toml | 2 +- 16 files changed, 5 insertions(+), 12 deletions(-) rename {crates/credential => credential}/README.md (100%) rename {crates/credential => credential}/cargo-credential-1password/Cargo.toml (100%) rename {crates/credential => credential}/cargo-credential-1password/src/main.rs (100%) rename {crates/credential => credential}/cargo-credential-gnome-secret/Cargo.toml (100%) rename {crates/credential => credential}/cargo-credential-gnome-secret/build.rs (100%) rename {crates/credential => credential}/cargo-credential-gnome-secret/src/main.rs (100%) rename {crates/credential => credential}/cargo-credential-macos-keychain/Cargo.toml (100%) rename {crates/credential => credential}/cargo-credential-macos-keychain/src/main.rs (100%) rename {crates/credential => credential}/cargo-credential-wincred/Cargo.toml (100%) rename {crates/credential => credential}/cargo-credential-wincred/src/main.rs (100%) rename {crates/credential => credential}/cargo-credential/Cargo.toml (100%) rename {crates/credential => credential}/cargo-credential/README.md (93%) rename {crates/credential => credential}/cargo-credential/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 554c275b4..7ad57a16c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,17 +1,10 @@ [workspace] resolver = "2" members = [ + "crates/*", + "credential/*", "benches/benchsuite", "benches/capture", - "crates/cargo-platform", - "crates/cargo-test-macro", - "crates/cargo-test-support", - "crates/cargo-util", - "crates/crates-io", - "crates/credential/*", - "crates/home", - "crates/mdman", - "crates/resolver-tests", ] exclude = [ # For linkchecker (downloaded during CI) and semver-check diff --git a/crates/credential/README.md b/credential/README.md similarity index 100% rename from crates/credential/README.md rename to credential/README.md diff --git a/crates/credential/cargo-credential-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml similarity index 100% rename from crates/credential/cargo-credential-1password/Cargo.toml rename to credential/cargo-credential-1password/Cargo.toml diff --git a/crates/credential/cargo-credential-1password/src/main.rs b/credential/cargo-credential-1password/src/main.rs similarity index 100% rename from crates/credential/cargo-credential-1password/src/main.rs rename to credential/cargo-credential-1password/src/main.rs diff --git a/crates/credential/cargo-credential-gnome-secret/Cargo.toml b/credential/cargo-credential-gnome-secret/Cargo.toml similarity index 100% rename from crates/credential/cargo-credential-gnome-secret/Cargo.toml rename to credential/cargo-credential-gnome-secret/Cargo.toml diff --git a/crates/credential/cargo-credential-gnome-secret/build.rs b/credential/cargo-credential-gnome-secret/build.rs similarity index 100% rename from crates/credential/cargo-credential-gnome-secret/build.rs rename to credential/cargo-credential-gnome-secret/build.rs diff --git a/crates/credential/cargo-credential-gnome-secret/src/main.rs b/credential/cargo-credential-gnome-secret/src/main.rs similarity index 100% rename from crates/credential/cargo-credential-gnome-secret/src/main.rs rename to credential/cargo-credential-gnome-secret/src/main.rs diff --git a/crates/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml similarity index 100% rename from crates/credential/cargo-credential-macos-keychain/Cargo.toml rename to credential/cargo-credential-macos-keychain/Cargo.toml diff --git a/crates/credential/cargo-credential-macos-keychain/src/main.rs b/credential/cargo-credential-macos-keychain/src/main.rs similarity index 100% rename from crates/credential/cargo-credential-macos-keychain/src/main.rs rename to credential/cargo-credential-macos-keychain/src/main.rs diff --git a/crates/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml similarity index 100% rename from crates/credential/cargo-credential-wincred/Cargo.toml rename to credential/cargo-credential-wincred/Cargo.toml diff --git a/crates/credential/cargo-credential-wincred/src/main.rs b/credential/cargo-credential-wincred/src/main.rs similarity index 100% rename from crates/credential/cargo-credential-wincred/src/main.rs rename to credential/cargo-credential-wincred/src/main.rs diff --git a/crates/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml similarity index 100% rename from crates/credential/cargo-credential/Cargo.toml rename to credential/cargo-credential/Cargo.toml diff --git a/crates/credential/cargo-credential/README.md b/credential/cargo-credential/README.md similarity index 93% rename from crates/credential/cargo-credential/README.md rename to credential/cargo-credential/README.md index 1f75e598a..53dc8e6b7 100644 --- a/crates/credential/cargo-credential/README.md +++ b/credential/cargo-credential/README.md @@ -8,7 +8,7 @@ Documentation about credential processes may be found at https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#credential-process Example implementations may be found at -https://github.com/rust-lang/cargo/tree/master/crates/credential +https://github.com/rust-lang/cargo/tree/master/credential ## Usage diff --git a/crates/credential/cargo-credential/src/lib.rs b/credential/cargo-credential/src/lib.rs similarity index 100% rename from crates/credential/cargo-credential/src/lib.rs rename to credential/cargo-credential/src/lib.rs diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index f4c671fd3..5924c5d18 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -86,7 +86,7 @@ //! - [`cargo-test-macro`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-test-macro) //! ([nightly docs](https://doc.rust-lang.org/nightly/nightly-rustc/cargo_test_macro/index.html)): //! This is the `#[cargo_test]` proc-macro used by the test suite to define tests. -//! - [`credential`](https://github.com/rust-lang/cargo/tree/master/crates/credential) +//! - [`credential`](https://github.com/rust-lang/cargo/tree/master/credential) //! This subdirectory contains several packages for implementing the //! experimental //! [credential-process](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#credential-process) diff --git a/triagebot.toml b/triagebot.toml index 192859537..1700ba74e 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -165,7 +165,7 @@ trigger_files = ["src/cargo/core/compiler/fingerprint/"] trigger_files = ["src/cargo/sources/registry/", "src/cargo/core/registry.rs"] [autolabel."A-registry-authentication"] -trigger_files = ["src/cargo/util/auth.rs", "crates/credential/"] +trigger_files = ["src/cargo/util/auth.rs", "credential/"] [autolabel."A-semver"] trigger_files = [