From 1f811710db66920a0712237f3fb18dcb27dfea68 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Tue, 17 Mar 2026 14:56:47 +0100 Subject: [PATCH 1/2] fix(deny): allow OpenSSL license and remove stale entries `aws-lc-sys` uses the OpenSSL license (via `ISC AND (Apache-2.0 OR ISC) AND OpenSSL`), which was not in the allow list, causing `cargo deny check` to fail. Also removes stale entries no longer present in the dependency tree: - `Unicode-DFS-2016` license allowance - `LicenseRef-ring` / `LicenseRef-webpki` license allowances and clarifications - `tiny-keccak` CC0-1.0 exception Amp-Thread-ID: https://ampcode.com/threads/T-019cfc11-1f81-72f3-87c5-542e7e79d0e9 Co-authored-by: Amp --- deny.toml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/deny.toml b/deny.toml index 0d53d22a6..0063507b5 100644 --- a/deny.toml +++ b/deny.toml @@ -23,36 +23,15 @@ allow = [ "BSD-2-Clause", "BSD-3-Clause", "ISC", - "Unicode-DFS-2016", + "OpenSSL", "Unicode-3.0", "Unlicense", "MPL-2.0", "Zlib", "BSL-1.0", - # https://github.com/briansmith/ring/issues/902 - "LicenseRef-ring", - # https://github.com/briansmith/webpki/issues/148 - "LicenseRef-webpki", "CDLA-Permissive-2.0", ] -exceptions = [ - # CC0 is a permissive license but somewhat unclear status for source code - # so we prefer to not have dependencies using it - # https://tldrlegal.com/license/creative-commons-cc0-1.0-universal - { allow = ["CC0-1.0"], name = "tiny-keccak" }, -] - -[[licenses.clarify]] -name = "ring" -expression = "LicenseRef-ring" -license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }] - -[[licenses.clarify]] -name = "webpki" -expression = "LicenseRef-webpki" -license-files = [{ path = "LICENSE", hash = 0x001c7e6c }] - [sources] unknown-registry = "deny" unknown-git = "deny" From 6d5014b624d6d1f371a8f35b9fde2854df6ca1c3 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Tue, 17 Mar 2026 14:59:58 +0100 Subject: [PATCH 2/2] fix(clippy): use values()/into_values() instead of iter with unused keys Fixes `clippy::iter_kv_map` lint on nightly for the `artifacts` and `into_artifacts` iterators. Amp-Thread-ID: https://ampcode.com/threads/T-019cfc11-1f81-72f3-87c5-542e7e79d0e9 Co-authored-by: Amp --- crates/compilers/src/artifact_output/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/compilers/src/artifact_output/mod.rs b/crates/compilers/src/artifact_output/mod.rs index f2c8fba57..c565f9a33 100644 --- a/crates/compilers/src/artifact_output/mod.rs +++ b/crates/compilers/src/artifact_output/mod.rs @@ -305,7 +305,7 @@ impl Artifacts { &self, ) -> impl Iterator + '_ { self.0.iter().flat_map(|(source, contract_artifacts)| { - contract_artifacts.iter().flat_map(move |(_contract_name, artifacts)| { + contract_artifacts.values().flat_map(move |artifacts| { artifacts.iter().filter_map(move |artifact| { O::contract_name(&artifact.file).map(|name| { ( @@ -331,7 +331,7 @@ impl Artifacts { self, ) -> impl Iterator { self.0.into_iter().flat_map(|(source, contract_artifacts)| { - contract_artifacts.into_iter().flat_map(move |(_contract_name, artifacts)| { + contract_artifacts.into_values().flat_map(move |artifacts| { let source = source.clone(); artifacts.into_iter().filter_map(move |artifact| { O::contract_name(&artifact.file).map(|name| {