about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeihang Lo <me@weihanglo.tw>2023-09-27 09:21:34 +0800
committerWeihang Lo <me@weihanglo.tw>2023-09-27 09:22:42 +0800
commit0ff1254d91d5b51a5079bd0729b41beb7a2f4adc (patch)
tree4892d08a36cb05b3e9fe90e39c9b4821b7653855
parent21627d60cfe9867b64d3dc77aea1c79ad8d03265 (diff)
downloadrust-0ff1254d91d5b51a5079bd0729b41beb7a2f4adc.tar.gz
rust-0ff1254d91d5b51a5079bd0729b41beb7a2f4adc.zip
Update cargo
New license exceptions from gix:

* (byteyarn", "Apache-2.0")
* ("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause")
m---------src/tools/cargo0
-rw-r--r--src/tools/tidy/src/deps.rs4
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"),