diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-13 12:19:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 12:19:23 +0200 |
| commit | a6fed6a0ca038e32871a1d9a770e2a58daa7d1ee (patch) | |
| tree | 58d517aa1c40e709242046e0e472fc5085f9e11f | |
| parent | 66233fbb32a8f3b2efd3f104f7e02bc9fbe1d344 (diff) | |
| parent | 9f1c7603496a4cc68ee90cc67e328cd43e37223e (diff) | |
| download | rust-a6fed6a0ca038e32871a1d9a770e2a58daa7d1ee.tar.gz rust-a6fed6a0ca038e32871a1d9a770e2a58daa7d1ee.zip | |
Rollup merge of #113598 - weihanglo:update-cargo, r=weihanglo
Update cargo 10 commits in 45782b6b8afd1da042d45c2daeec9c0744f72cc7..694a579566a9a1482b20aff8a68f0e4edd99bd28 2023-07-05 16:54:51 +0000 to 2023-07-11 22:28:29 +0000 - fix(embedded): Always generate valid package names (rust-lang/cargo#12349) - fix(embedded): Error on unsupported commands (rust-lang/cargo#12350) - chore(ci): Automatically test new packages by using `--workspace` (rust-lang/cargo#12342) - contrib docs: Add some more detail about how publishing works (rust-lang/cargo#12344) - docs: Put cargo-add change under nightly (rust-lang/cargo#12343) - Minor: Use "number" instead of "digit" when explaining Cargo's use of semver (rust-lang/cargo#12340) - Update criterion (rust-lang/cargo#12338) - Add profile strip to config docs. (rust-lang/cargo#12337) - update re: multiple versions that differ only in the metadata tag (rust-lang/cargo#12335) - doc: state `PackageId`/`SourceId` string is opaque (rust-lang/cargo#12313) r? ``@ghost``
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 45782b6b8afd1da042d45c2daeec9c0744f72cc +Subproject 694a579566a9a1482b20aff8a68f0e4edd99bd2 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 2c237c418b1..9f0f0d86c8b 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -56,6 +56,9 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[ // tidy-alphabetical-start ("bitmaps", "MPL-2.0+"), ("bytesize", "Apache-2.0"), + ("ciborium", "Apache-2.0"), + ("ciborium-io", "Apache-2.0"), + ("ciborium-ll", "Apache-2.0"), ("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"), ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"), ("im-rc", "MPL-2.0+"), |