Auto merge of #137057 - weihanglo:update-cargo, r=weihanglo

Update cargo 13 commits in 2928e32734b04925ee51e1ae88bea9a83d2fd451..ce948f4616e3d4277e30c75c8bb01e094910df39 2025-02-07 16:50:22 +0000 to 2025-02-14 20:32:07 +0000 - util: provide a better error message for invalid SSH URLs (rust-lang/cargo#15185) - Fix the description of the `"root"` field of the `cargo metadata`'s output (rust-lang/cargo#15182) - refactor: Consolidate creation of SourceId from manifest path (rust-lang/cargo#15172) - docs(embedded): Note the shebang deviation (rust-lang/cargo#15173) - refactor(embedded): Integrate cargo-script logic into main parser (rust-lang/cargo#15168) - feat: implement workspace feature unification (rust-lang/cargo#15157) - Fix race condition in panic_abort_tests (rust-lang/cargo#15169) - Update all dependencies (rust-lang/cargo#15166) - Update curl from 8.9.0 to 8.12.0 (rust-lang/cargo#15162) - Update annotate-snippets from 0.11.4 to 0.11.5 (rust-lang/cargo#15165) - Update deny.toml (rust-lang/cargo#15164) - Update rusqlite from 0.32.1 to 0.33.0 (rust-lang/cargo#15163) - fix: align first line of unordered list with following (rust-lang/cargo#15161)
rust-lang · Feb 15, 2025 · 9cd60bd · 9cd60bd
2 parents 608e228 + ed870c3
commit 9cd60bd
Show file tree

Hide file tree

Showing 2 changed files with 2 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
@@ -132,6 +132,7 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
     ("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
     ("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause"),
     ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
+    ("foldhash", "Zlib"),
     ("im-rc", "MPL-2.0+"),
     ("normalize-line-endings", "Apache-2.0"),
     ("openssl", "Apache-2.0"),
+890 −501		Cargo.lock
+49 −49		Cargo.toml
+5 −5		crates/cargo-util-schemas/manifest.schema.json
+9 −37		crates/cargo-util-schemas/src/manifest/mod.rs
+10 −10		crates/mdman/doc/out/mdman.1
+1 −1		crates/mdman/src/format/man.rs
+3 −3		crates/mdman/tests/compare/expected/formatting.1
+5 −5		crates/mdman/tests/compare/expected/options.1
+33 −34		deny.toml
+2 −0		src/cargo/core/features.rs
+11 −0		src/cargo/core/source_id.rs
+27 −14		src/cargo/core/workspace.rs
+2 −0		src/cargo/ops/cargo_install.rs
+1 −0		src/cargo/ops/fix.rs
+5 −0		src/cargo/ops/resolve.rs
+1 −0		src/cargo/ops/vendor.rs
+8 −0		src/cargo/util/context/mod.rs
+12 −1		src/cargo/util/into_url.rs
+16 −89		src/cargo/util/toml/embedded.rs
+329 −151		src/cargo/util/toml/mod.rs
+1 −1		src/cargo/util/toml/targets.rs
+4 −4		src/doc/man/cargo-metadata.md
+3 −3		src/doc/man/generated_txt/cargo-metadata.txt
+3 −3		src/doc/src/commands/cargo-metadata.md
+13 −13		src/etc/man/cargo-add.1
+20 −20		src/etc/man/cargo-bench.1
+15 −15		src/etc/man/cargo-build.1
+15 −15		src/etc/man/cargo-check.1
+7 −7		src/etc/man/cargo-clean.1
+15 −15		src/etc/man/cargo-doc.1
+7 −7		src/etc/man/cargo-fetch.1
+15 −15		src/etc/man/cargo-fix.1
+7 −7		src/etc/man/cargo-generate-lockfile.1
+7 −7		src/etc/man/cargo-info.1
+5 −5		src/etc/man/cargo-init.1
+25 −25		src/etc/man/cargo-install.1
+7 −7		src/etc/man/cargo-locate-project.1
+5 −5		src/etc/man/cargo-login.1
+5 −5		src/etc/man/cargo-logout.1
+14 −14		src/etc/man/cargo-metadata.1
+5 −5		src/etc/man/cargo-new.1
+5 −5		src/etc/man/cargo-owner.1
+15 −15		src/etc/man/cargo-package.1
+7 −7		src/etc/man/cargo-pkgid.1
+8 −8		src/etc/man/cargo-publish.1
+7 −7		src/etc/man/cargo-remove.1
+15 −15		src/etc/man/cargo-run.1
+18 −18		src/etc/man/cargo-rustc.1
+17 −17		src/etc/man/cargo-rustdoc.1
+5 −5		src/etc/man/cargo-search.1
+22 −22		src/etc/man/cargo-test.1
+24 −24		src/etc/man/cargo-tree.1
+10 −10		src/etc/man/cargo-uninstall.1
+11 −11		src/etc/man/cargo-update.1
+7 −7		src/etc/man/cargo-vendor.1
+5 −5		src/etc/man/cargo-yank.1
+7 −7		src/etc/man/cargo.1
+1 −2		tests/testsuite/alt_registry.rs
+23 −0		tests/testsuite/bad_config.rs
+29 −27		tests/testsuite/cargo/z_help/stdout.term.svg
+3 −3		tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg
+205 −0		tests/testsuite/feature_unification.rs
+3 −2		tests/testsuite/git.rs
+4 −4		tests/testsuite/lints/error/stderr.term.svg
+7 −7		tests/testsuite/lints/inherited/stderr.term.svg
+4 −4		tests/testsuite/lints/warning/stderr.term.svg
+1 −0		tests/testsuite/main.rs
+400 −0		tests/testsuite/script.rs
+5 −1		tests/testsuite/test.rs