diff options
| author | bors <bors@rust-lang.org> | 2023-09-27 03:41:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-27 03:41:23 +0000 |
| commit | d206f2c0857eb879877f27508139dd62a40294c3 (patch) | |
| tree | 97defb62e6ffde9c0e19c3bd542beaeeaadd66e7 | |
| parent | 6b99cf1d35c8b7855a6b7f503d91edb223f027a1 (diff) | |
| parent | 0ff1254d91d5b51a5079bd0729b41beb7a2f4adc (diff) | |
| download | rust-d206f2c0857eb879877f27508139dd62a40294c3.tar.gz rust-d206f2c0857eb879877f27508139dd62a40294c3.zip | |
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
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 414d9e3a6d8096f3e276234ce220c868767a879 +Subproject e6aabe8b3fcf639be3a5bf68e77853bd7b3fa27 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index c05349c8e8d..7d3ef4197a7 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -58,14 +58,14 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[ // tidy-alphabetical-start ("bitmaps", "MPL-2.0+"), ("bytesize", "Apache-2.0"), + ("byteyarn", "Apache-2.0"), ("ciborium", "Apache-2.0"), ("ciborium-io", "Apache-2.0"), ("ciborium-ll", "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"), ("im-rc", "MPL-2.0+"), - ("imara-diff", "Apache-2.0"), - ("instant", "BSD-3-Clause"), ("normalize-line-endings", "Apache-2.0"), ("openssl", "Apache-2.0"), ("ryu", "Apache-2.0 OR BSL-1.0"), |