Rollup merge of rust-lang#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`
matthiaskrgr · Jul 12, 2023 · ac2e412 · ac2e412
2 parents b965935 + 9f1c760
commit ac2e412
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git 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+"),
+39 −45		.github/workflows/main.yml
+2 −2		CHANGELOG.md
+39 −57		Cargo.lock
+1 −1		Cargo.toml
+6 −0		publish.py
+7 −0		src/bin/cargo/commands/package.rs
+7 −0		src/bin/cargo/commands/pkgid.rs
+7 −0		src/bin/cargo/commands/publish.rs
+7 −8		src/cargo/util/restricted_names.rs
+32 −5		src/doc/contrib/src/process/release.md
+38 −6		src/doc/man/cargo-metadata.md
+39 −6		src/doc/man/generated_txt/cargo-metadata.txt
+38 −6		src/doc/src/commands/cargo-metadata.md
+8 −0		src/doc/src/reference/config.md
+2 −5		src/doc/src/reference/resolver.md
+1 −1		src/doc/src/reference/specifying-dependencies.md
+43 −6		src/etc/man/cargo-metadata.1
+100 −0		tests/testsuite/script.rs