Update cargo

rust-lang-ci · Jun 20, 2023 · 214a0d1 · 214a0d1
1 parent a34cead
commit 214a0d1
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