Skip to content

Commit 5a65be8

Browse files
committed
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`
2 parents 314c39d + b40b92f commit 5a65be8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/tools/tidy/src/deps.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ const LICENSES: &[&str] = &[
1616
"Apache-2.0 OR MIT",
1717
"Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT", // wasi license
1818
"Apache-2.0/MIT",
19+
"BSD-2-Clause", // arrayref from Cargo
20+
"CC0-1.0 OR Apache-2.0", // blake3 from Cargo
21+
"CC0-1.0 OR MIT-0 OR Apache-2.0", // constant_time_eq from cargo
1922
"ISC",
2023
"MIT / Apache-2.0",
2124
"MIT OR Apache-2.0 OR Zlib", // tinyvec_macros
@@ -54,7 +57,7 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[
5457
// tidy-alphabetical-start
5558
("bitmaps", "MPL-2.0+"),
5659
("bytesize", "Apache-2.0"),
57-
("dunce", "CC0-1.0 OR MIT-0"),
60+
("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
5861
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
5962
("im-rc", "MPL-2.0+"),
6063
("imara-diff", "Apache-2.0"),

0 commit comments

Comments
 (0)