Skip to content

Commit 95535a9

Browse files
committed
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
2 parents 9d506e5 + 895435f commit 95535a9

File tree

16 files changed

+5
-12
lines changed

16 files changed

+5
-12
lines changed

Cargo.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
[workspace]
22
resolver = "2"
33
members = [
4+
"crates/*",
5+
"credential/*",
46
"benches/benchsuite",
57
"benches/capture",
6-
"crates/cargo-platform",
7-
"crates/cargo-test-macro",
8-
"crates/cargo-test-support",
9-
"crates/cargo-util",
10-
"crates/crates-io",
11-
"crates/credential/*",
12-
"crates/home",
13-
"crates/mdman",
14-
"crates/resolver-tests",
158
]
169
exclude = [
1710
# For linkchecker (downloaded during CI) and semver-check
File renamed without changes.

crates/credential/cargo-credential/README.md renamed to credential/cargo-credential/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Documentation about credential processes may be found at
88
https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#credential-process
99

1010
Example implementations may be found at
11-
https://github.com/rust-lang/cargo/tree/master/crates/credential
11+
https://github.com/rust-lang/cargo/tree/master/credential
1212

1313
## Usage
1414

src/cargo/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
//! - [`cargo-test-macro`](https://github.com/rust-lang/cargo/tree/master/crates/cargo-test-macro)
8787
//! ([nightly docs](https://doc.rust-lang.org/nightly/nightly-rustc/cargo_test_macro/index.html)):
8888
//! This is the `#[cargo_test]` proc-macro used by the test suite to define tests.
89-
//! - [`credential`](https://github.com/rust-lang/cargo/tree/master/crates/credential)
89+
//! - [`credential`](https://github.com/rust-lang/cargo/tree/master/credential)
9090
//! This subdirectory contains several packages for implementing the
9191
//! experimental
9292
//! [credential-process](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#credential-process)

triagebot.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ trigger_files = ["src/cargo/core/compiler/fingerprint/"]
165165
trigger_files = ["src/cargo/sources/registry/", "src/cargo/core/registry.rs"]
166166

167167
[autolabel."A-registry-authentication"]
168-
trigger_files = ["src/cargo/util/auth.rs", "crates/credential/"]
168+
trigger_files = ["src/cargo/util/auth.rs", "credential/"]
169169

170170
[autolabel."A-semver"]
171171
trigger_files = [

0 commit comments

Comments
 (0)