Skip to content
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

Jump to bottom

Fix ignored private packages being assigned incorrect license #184

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Fix ignored private packages being assigned incorrect license #184

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
807cdb0
Fix ignored private packages being assigned incorrect license
danielnelson Feb 22, 2022
a63c296
Filter during generate instead
Jake-Shadle Mar 2, 2022
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
8 changes: 6 additions & 2 deletions src/cargo-about/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ struct Input<'a> {

fn generate(
nfos: &[licenses::KrateLicense<'_>],
resolved: &[licenses::Resolved],
resolved: &[Option<licenses::Resolved>],
files: &licenses::resolution::Files,
stream: term::termcolor::StandardStream,
hbs: &Handlebars<'_>,
Expand All @@ -270,7 +270,11 @@ fn generate(

let licenses = {
let mut licenses = BTreeMap::new();
for (krate_license, resolved) in nfos.iter().zip(resolved.iter()) {
for (krate_license, resolved) in nfos
.iter()
.zip(resolved.iter())
.filter_map(|(kl, res)| res.as_ref().map(|res| (kl, res)))
{
if !resolved.diagnostics.is_empty() {
let mut streaml = stream.lock();

Expand Down
5 changes: 3 additions & 2 deletions src/licenses/resolution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ impl<'acc> fmt::Display for Accepted<'acc> {
}
}

#[derive(Debug)]
pub struct Resolved {
/// The minimum license requirements that are required
pub licenses: Vec<LicenseReq>,
Expand Down Expand Up @@ -100,12 +101,12 @@ pub fn resolve(
licenses: &[KrateLicense<'_>],
accepted: &[Licensee],
krate_cfg: &std::collections::BTreeMap<String, config::KrateConfig>,
) -> (Files, Vec<Resolved>) {
) -> (Files, Vec<Option<Resolved>>) {
let mut files = codespan::Files::new();

let resolved = licenses
.iter()
.filter_map(|kl| {
.map(|kl| {
let mut resolved = Resolved {
licenses: Vec::new(),
diagnostics: Vec::new(),
Expand Down