Skip to content

fix(ci): allow OpenSSL license in cargo-deny and fix clippy iter_kv_map lint #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerosnacks merged 2 commits into from
Mar 17, 2026
Merged

fix(ci): allow OpenSSL license in cargo-deny and fix clippy iter_kv_map lint #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f81171
fix(deny): allow OpenSSL license and remove stale entries
zerosnacks Mar 17, 2026
6d5014b
fix(clippy): use values()/into_values() instead of iter with unused keys
zerosnacks Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/compilers/src/artifact_output/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ impl<T> Artifacts<T> {
&self,
) -> impl Iterator<Item = (ArtifactId, &T)> + '_ {
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| {
(
Expand All @@ -331,7 +331,7 @@ impl<T> Artifacts<T> {
self,
) -> impl Iterator<Item = (ArtifactId, T)> {
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| {
Expand Down
23 changes: 1 addition & 22 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading