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| { 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"