diff options
| author | bors <bors@rust-lang.org> | 2023-06-15 06:04:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-15 06:04:14 +0000 |
| commit | 5a65be815211a059b08ee3b786583308377372fa (patch) | |
| tree | cde22852b12ab5b8f951a8cc97b089c36a9cd080 | |
| parent | 314c39d2ea07d8b50649149358ebeb1a6bd09179 (diff) | |
| parent | b40b92fb99c89c9ba247d60aa038bf4337a0b048 (diff) | |
| download | rust-5a65be815211a059b08ee3b786583308377372fa.tar.gz rust-5a65be815211a059b08ee3b786583308377372fa.zip | |
Auto merge of #112601 - weihanglo:update-cargo, r=weihanglo
Update cargo 11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2 2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000 - fix(embedded): Don't append hash to bin names (rust-lang/cargo#12269) - Fix version requirement example in Dependency Resolution, SemVer compatibility section (rust-lang/cargo#12267) - Update triagebot links. (rust-lang/cargo#12265) - Show a better error when container tests fail. (rust-lang/cargo#12264) - chore: update dependencies (rust-lang/cargo#12261) - refactor(embedded) (rust-lang/cargo#12262) - docs: clarify the use of `default` branch instead of `main` by default (rust-lang/cargo#12251) - docs: update changelog for 1.71 backport and 1.72 (rust-lang/cargo#12256) - feat: Initial support for single-file packages (rust-lang/cargo#12245) - test(z-flags): Verify `-Z` flags list is sorted (rust-lang/cargo#12224) - refactor: registry data kinds cleanup (rust-lang/cargo#12248) --- This commit also update LICENSE exceptions, as Cargo introduced a newer version of `dunce` and `blake3` as dependencies. r? `@ghost`
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 49b6d9e179a91cf7645142541c9563443f64bf2 +Subproject 0c14026aa84ee2ec4c67460c0a18abc8519ca6b diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index ac2056bcc85..df9c3989b6e 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -16,6 +16,9 @@ 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 @@ -54,7 +57,7 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[ // tidy-alphabetical-start ("bitmaps", "MPL-2.0+"), ("bytesize", "Apache-2.0"), - ("dunce", "CC0-1.0 OR MIT-0"), + ("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"), ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"), ("im-rc", "MPL-2.0+"), ("imara-diff", "Apache-2.0"), |