Auto merge of rust-lang#112859 - weihanglo:update-cargo, r=weihanglo

Update cargo 12 commits in 0c14026aa84ee2ec4c67460c0a18abc8519ca6b2..dead4b8740c4b6a8ed5211e37c99cf81d01c3b1c 2023-06-14 18:43:05 +0000 to 2023-06-20 20:07:17 +0000 - Convert valid feature name warning to an error. (rust-lang/cargo#12291) - fix(embedded): Don't pollute script dir with lockfile (rust-lang/cargo#12284) - fix: remove `-Zjobserver-per-rustc` again (rust-lang/cargo#12285) - docs: some tweaks around `cargo test` (rust-lang/cargo#12288) - Enable `doctest-in-workspace` by default (rust-lang/cargo#12221) - fix(embedded): Don't auto-discover build.rs files (rust-lang/cargo#12283) - fix(embeded): Don't pollute the scripts dir with `target/` (rust-lang/cargo#12282) - feat: prepare for the next lockfile bump (rust-lang/cargo#12279) - fix(embedded): Don't create an intermediate manifest (rust-lang/cargo#12268) - refactor(embedded): Switch to `syn` for parsing doc comments (rust-lang/cargo#12258) - fix(embedded): Align package name sanitization with cargo-new (rust-lang/cargo#12255) - Clarify the default behavior of cargo-install. (rust-lang/cargo#12276) r? `@ghost`
rust-lang-ci · Jun 20, 2023 · 4457658 · 4457658
2 parents 4651421 + 214a0d1
commit 4457658
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
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
@@ -16,9 +16,6 @@ const LICENSES: &[&str] = &[
     "Apache-2.0 OR MIT",
     "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT", // wasi license
     "Apache-2.0/MIT",
-    "BSD-2-Clause",                                        // arrayref from Cargo
-    "CC0-1.0 OR Apache-2.0",                               // blake3 from Cargo
-    "CC0-1.0 OR MIT-0 OR Apache-2.0",                      // constant_time_eq from cargo
     "ISC",
     "MIT / Apache-2.0",
     "MIT OR Apache-2.0 OR Zlib",                           // tinyvec_macros
+1 −35		Cargo.lock
+0 −4		Cargo.toml
+0 −4		crates/resolver-tests/src/lib.rs
+0 −1		deny.toml
+12 −6		src/bin/cargo/commands/run.rs
+6 −4		src/cargo/core/features.rs
+6 −0		src/cargo/core/manifest.rs
+9 −0		src/cargo/core/resolver/encode.rs
+4 −0		src/cargo/core/resolver/resolve.rs
+0 −3		src/cargo/core/resolver/version_prefs.rs
+48 −20		src/cargo/core/summary.rs
+27 −1		src/cargo/core/workspace.rs
+1 −0		src/cargo/ops/cargo_new.rs
+1 −1		src/cargo/ops/cargo_package.rs
+3 −8		src/cargo/ops/cargo_test.rs
+32 −11		src/cargo/ops/lockfile.rs
+12 −20		src/cargo/sources/registry/index.rs
+24 −0		src/cargo/util/restricted_names.rs
+382 −357		src/cargo/util/toml/embedded.rs
+24 −5		src/cargo/util/toml/mod.rs
+2 −2		src/doc/man/cargo-install.md
+10 −3		src/doc/man/cargo-test.md
+3 −2		src/doc/man/generated_txt/cargo-install.txt
+12 −5		src/doc/man/generated_txt/cargo-test.txt
+2 −2		src/doc/src/commands/cargo-install.md
+10 −3		src/doc/src/commands/cargo-test.md
+8 −19		src/doc/src/reference/unstable.md
+2 −2		src/etc/man/cargo-install.1
+10 −3		src/etc/man/cargo-test.1
+1 −1		tests/testsuite/build_script.rs
+93 −4		tests/testsuite/doc.rs
+42 −57		tests/testsuite/features.rs
+63 −0		tests/testsuite/lockfile_compat.rs
+149 −36		tests/testsuite/script.rs