Update cargo

New license exceptions from gix: * (byteyarn", "Apache-2.0") * ("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause")
rust-lang · Sep 27, 2023 · 0ff1254 · 0ff1254
1 parent 21627d6
commit 0ff1254
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git 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"),
+1 −1		.github/renovate.json5
+248 −261		Cargo.lock
+4 −4		Cargo.toml
+2 −2		crates/cargo-test-support/src/lib.rs
+1 −0		crates/cargo-test-support/src/registry.rs
+2 −2		deny.toml
+0 −37		src/cargo/core/package_id.rs
+56 −25		src/cargo/core/shell.rs
+56 −35		src/cargo/core/source_id.rs
+1 −1		src/cargo/ops/cargo_compile/mod.rs
+1 −1		src/cargo/sources/config.rs
+1 −6		src/cargo/util/auth/mod.rs
+4 −1		src/cargo/util/config/mod.rs
+154 −39		src/cargo/util/toml/embedded.rs
+5 −2		src/doc/man/cargo-publish.md
+6 −2		src/doc/man/generated_txt/cargo-publish.txt
+5 −2		src/doc/src/commands/cargo-publish.md
+8 −23		src/doc/src/reference/unstable.md
+8 −2		src/etc/man/cargo-publish.1
+1 −0		tests/testsuite/publish.rs
+15 −19		tests/testsuite/script.rs
+46 −1		tests/testsuite/source_replacement.rs