Auto merge of #11996 - epage:move, r=weihanglo

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
rust-lang · Apr 19, 2023 · 95535a9 · 95535a9
2 parents 9d506e5 + 895435f
commit 95535a9
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 12 deletions.
diff --git 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 → credential/README.md b/crates/credential/README.md → credential/README.md
diff --git a/...ial/cargo-credential-1password/Cargo.toml → ...ial/cargo-credential-1password/Cargo.toml b/...ial/cargo-credential-1password/Cargo.toml → ...ial/cargo-credential-1password/Cargo.toml
diff --git a/...al/cargo-credential-1password/src/main.rs → ...al/cargo-credential-1password/src/main.rs b/...al/cargo-credential-1password/src/main.rs → ...al/cargo-credential-1password/src/main.rs
diff --git a/.../cargo-credential-gnome-secret/Cargo.toml → .../cargo-credential-gnome-secret/Cargo.toml b/.../cargo-credential-gnome-secret/Cargo.toml → .../cargo-credential-gnome-secret/Cargo.toml
diff --git a/...al/cargo-credential-gnome-secret/build.rs → ...al/cargo-credential-gnome-secret/build.rs b/...al/cargo-credential-gnome-secret/build.rs → ...al/cargo-credential-gnome-secret/build.rs
diff --git a/...cargo-credential-gnome-secret/src/main.rs → ...cargo-credential-gnome-secret/src/main.rs b/...cargo-credential-gnome-secret/src/main.rs → ...cargo-credential-gnome-secret/src/main.rs
diff --git a/...argo-credential-macos-keychain/Cargo.toml → ...argo-credential-macos-keychain/Cargo.toml b/...argo-credential-macos-keychain/Cargo.toml → ...argo-credential-macos-keychain/Cargo.toml
diff --git a/...rgo-credential-macos-keychain/src/main.rs → ...rgo-credential-macos-keychain/src/main.rs b/...rgo-credential-macos-keychain/src/main.rs → ...rgo-credential-macos-keychain/src/main.rs
diff --git a/...ntial/cargo-credential-wincred/Cargo.toml → ...ntial/cargo-credential-wincred/Cargo.toml b/...ntial/cargo-credential-wincred/Cargo.toml → ...ntial/cargo-credential-wincred/Cargo.toml
diff --git a/...tial/cargo-credential-wincred/src/main.rs → ...tial/cargo-credential-wincred/src/main.rs b/...tial/cargo-credential-wincred/src/main.rs → ...tial/cargo-credential-wincred/src/main.rs
diff --git a/...es/credential/cargo-credential/Cargo.toml → credential/cargo-credential/Cargo.toml b/...es/credential/cargo-credential/Cargo.toml → credential/cargo-credential/Cargo.toml
diff --git a/crates/credential/cargo-credential/README.md → credential/cargo-credential/README.md b/crates/credential/cargo-credential/README.md → 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/...es/credential/cargo-credential/src/lib.rs → credential/cargo-credential/src/lib.rs b/...es/credential/cargo-credential/src/lib.rs → credential/cargo-credential/src/lib.rs
diff --git 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
@@ -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 = [