Skip to content

Commit

Permalink
Update cargo
Browse files Browse the repository at this point in the history 
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 #126930,
so should be fine for Cargo as well.
  • Loading branch information
@weihanglo
weihanglo committed Oct 9, 2024
1 parent a49aefc commit 7018a99
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 30 files
+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
3 changes: 3 additions & 0 deletions src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit 7018a99

Please sign in to comment.