diff options
| author | bors <bors@rust-lang.org> | 2023-11-04 06:22:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-04 06:22:05 +0000 |
| commit | 2db26d3d55387930f1b1dfb84810bcde5a787a09 (patch) | |
| tree | d77c57462609a598a11c76318eded7b974113c2c | |
| parent | a9b03ffe9b23a0832c897e25f246439d99d3026d (diff) | |
| parent | f3587204c82b61a69c85f2e1c9f03613e550dc59 (diff) | |
| download | rust-2db26d3d55387930f1b1dfb84810bcde5a787a09.tar.gz rust-2db26d3d55387930f1b1dfb84810bcde5a787a09.zip | |
Auto merge of #117566 - weihanglo:update-cargo, r=weihanglo
Update cargo 8 commits in b4d18d4bd3db6d872892f6c87c51a02999b80802..65e297d1ec0dee1a74800efe600b8dc163bcf5db 2023-10-31 18:19:10 +0000 to 2023-11-03 20:56:31 +0000 - fix(cli): Clarify --test is for targets, not test functions (rust-lang/cargo#12915) - Updating "features" documentation to add a note about the new limit on number of features (rust-lang/cargo#12913) - fix: merge `trim-paths` from different profiles (rust-lang/cargo#12908) - Add regression test for issue 6915: features and transitive dev deps (rust-lang/cargo#12907) - chore(deps): update rust crate gix to 0.55.2 (rust-lang/cargo#12906) - chore(deps): update compatible (rust-lang/cargo#12905) - docs(ref): Fix open-semver-range issue link (rust-lang/cargo#12904) - docs(ref): Highlight commands to answer dep resolution questions (rust-lang/cargo#12903) r? ghost
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject b4d18d4bd3db6d872892f6c87c51a02999b8080 +Subproject 65e297d1ec0dee1a74800efe600b8dc163bcf5d diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 3a3b26c2f63..5e6dfaca702 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -107,7 +107,6 @@ const EXCEPTIONS_CARGO: ExceptionList = &[ // tidy-alphabetical-start ("bitmaps", "MPL-2.0+"), ("bytesize", "Apache-2.0"), - ("byteyarn", "Apache-2.0"), ("ciborium", "Apache-2.0"), ("ciborium-io", "Apache-2.0"), ("ciborium-ll", "Apache-2.0"), |