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

Update cargo 8 commits in ad074abe3a18ce8444c06f962ceecfd056acfc73..15fbd2f607d4defc87053b8b76bf5038f2483cf4 2024-10-04 18:18:15 +0000 to 2024-10-08 21:08:11 +0000 - initial version of checksum based freshness (rust-lang/cargo#14137) - feat: Add custom completer for completing registry name (rust-lang/cargo#14656) - Document build-plan as being deprecated (rust-lang/cargo#14657) - fix(complete): Don't complete files for any value (rust-lang/cargo#14653) - Add more SAT resolver tests (rust-lang/cargo#14614) - fix: avoid inserting duplicate `dylib_path_envvar` when calling `cargo run` recursively (rust-lang/cargo#14464) - chore(deps): bump gix-path from 0.10.9 to 0.10.11 (rust-lang/cargo#14489) - improve error reporting when feature not found in `activated_features` (rust-lang/cargo#14647) --- This also adds three license exceptions to Cargo. * arrayref — BSD-2-Clause * blake3 — CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception * constant_time_eq — CC0-1.0 OR MIT-0 OR Apache-2.0 These exceptions were added to rustc in rust-lang#126930, so should be fine for Cargo as well.
rust-lang-ci · Oct 9, 2024 · 883f9a2 · 883f9a2
2 parents 18deb53 + 7018a99
commit 883f9a2
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
@@ -129,11 +129,14 @@ const EXCEPTIONS_STDARCH: ExceptionList = &[
 
 const EXCEPTIONS_CARGO: ExceptionList = &[
     // tidy-alphabetical-start
+    ("arrayref", "BSD-2-Clause"),
     ("bitmaps", "MPL-2.0+"),
+    ("blake3", "CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception"),
     ("bytesize", "Apache-2.0"),
     ("ciborium", "Apache-2.0"),
     ("ciborium-io", "Apache-2.0"),
     ("ciborium-ll", "Apache-2.0"),
+    ("constant_time_eq", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
     ("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"),
+40 −6		Cargo.lock
+4 −1		Cargo.toml
+79 −0		crates/cargo-test-support/src/lib.rs
+1 −0		crates/resolver-tests/Cargo.toml
+260 −0		crates/resolver-tests/src/helpers.rs
+143 −742		crates/resolver-tests/src/lib.rs
+578 −0		crates/resolver-tests/src/sat.rs
+273 −0		crates/resolver-tests/tests/proptests.rs
+452 −0		crates/resolver-tests/tests/pubgrub.rs
+6 −478		crates/resolver-tests/tests/resolve.rs
+528 −0		crates/resolver-tests/tests/validated.rs
+1 −0		deny.toml
+5 −1		src/bin/cargo/commands/add.rs
+5 −2		src/bin/cargo/main.rs
+4 −1		src/cargo/core/compiler/build_runner/mod.rs
+5 −1		src/cargo/core/compiler/compilation.rs
+62 −0		src/cargo/core/compiler/fingerprint/dirty_reason.rs
+437 −71		src/cargo/core/compiler/fingerprint/mod.rs
+3 −0		src/cargo/core/compiler/mod.rs
+7 −2		src/cargo/core/compiler/output_depinfo.rs
+2 −0		src/cargo/core/features.rs
+24 −26		src/cargo/core/resolver/features.rs
+21 −1		src/cargo/util/command_prelude.rs
+19 −0		src/doc/src/reference/unstable.md
+1 −1		tests/testsuite/artifact_dep.rs
+60 −0		tests/testsuite/build.rs
+32 −30		tests/testsuite/cargo/z_help/stdout.term.svg
+2 −68		tests/testsuite/dep_info.rs
+2,990 −0		tests/testsuite/freshness_checksum.rs
+1 −0		tests/testsuite/main.rs