Skip to content

Commit d206f2c

Browse files
committed
Auto merge of #116189 - weihanglo:update-cargo, r=weihanglo
Update cargo 11 commits in 414d9e3a6d8096f3e276234ce220c868767a8792..e6aabe8b3fcf639be3a5bf68e77853bd7b3fa27d 2023-09-22 07:03:57 +0000 to 2023-09-26 16:31:53 +0000 - Use full target spec for `cargo rustc --print --target` (rust-lang/cargo#12743) - feat(embedded): Hack in code fence support (rust-lang/cargo#12681) - chore(ci): Update Renovate schema (rust-lang/cargo#12741) - more specific registry index not found msg (rust-lang/cargo#12732) - docs: warn about upload timeout (rust-lang/cargo#12733) - Fix some typos (rust-lang/cargo#12730) - upgrade gitoxide to v0.54 (rust-lang/cargo#12731) - Update target-arch-aware crates to support mips r6 targets (rust-lang/cargo#12720) - Buffer console status messages. (rust-lang/cargo#12727) - Fix spurious errors with networking tests. (rust-lang/cargo#12726) - refactor(SourceId): merge `name` and `alt_registry_key` into one enum (rust-lang/cargo#12675) r? ghost
2 parents 6b99cf1 + 0ff1254 commit d206f2c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/tools/tidy/src/deps.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[
5858
// tidy-alphabetical-start
5959
("bitmaps", "MPL-2.0+"),
6060
("bytesize", "Apache-2.0"),
61+
("byteyarn", "Apache-2.0"),
6162
("ciborium", "Apache-2.0"),
6263
("ciborium-io", "Apache-2.0"),
6364
("ciborium-ll", "Apache-2.0"),
6465
("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
66+
("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause"),
6567
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
6668
("im-rc", "MPL-2.0+"),
67-
("imara-diff", "Apache-2.0"),
68-
("instant", "BSD-3-Clause"),
6969
("normalize-line-endings", "Apache-2.0"),
7070
("openssl", "Apache-2.0"),
7171
("ryu", "Apache-2.0 OR BSL-1.0"),

0 commit comments

Comments
 (0)