Skip to content

Commit 883f9a2

Browse files
committed
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.
2 parents 18deb53 + 7018a99 commit 883f9a2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: src/tools/tidy/src/deps.rs

+3
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,14 @@ const EXCEPTIONS_STDARCH: ExceptionList = &[
129129

130130
const EXCEPTIONS_CARGO: ExceptionList = &[
131131
// tidy-alphabetical-start
132+
("arrayref", "BSD-2-Clause"),
132133
("bitmaps", "MPL-2.0+"),
134+
("blake3", "CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception"),
133135
("bytesize", "Apache-2.0"),
134136
("ciborium", "Apache-2.0"),
135137
("ciborium-io", "Apache-2.0"),
136138
("ciborium-ll", "Apache-2.0"),
139+
("constant_time_eq", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
137140
("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
138141
("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause"),
139142
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),

0 commit comments

Comments
 (0)