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

check returns anyhow::Result #159

Merged
merged 1 commit into from
Mar 4, 2024
Merged

check returns anyhow::Result #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions src/packs/checker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub(crate) trait CheckerInterface {
&self,
reference: &Reference,
configuration: &Configuration,
) -> Option<Violation>;
) -> anyhow::Result<Option<Violation>>;

fn is_strict_mode_violation(
&self,
Expand Down Expand Up @@ -415,19 +415,24 @@ fn get_all_violations(

debug!("Running checkers on resolved references");

let violations: HashSet<Violation> = checkers
let violations = checkers
.into_par_iter()
.flat_map(|c| {
references
.par_iter()
.flat_map(|r| c.check(r, configuration))
.collect::<HashSet<Violation>>()
.try_fold(HashSet::new, |mut acc, c| {
for reference in &references {
if let Some(violation) = c.check(reference, configuration)? {
acc.insert(violation);
}
}
Ok(acc)
})
.collect();
.try_reduce(HashSet::new, |mut acc, v| {
acc.extend(v);
Ok(acc)
});

debug!("Finished running checkers");

Ok(violations)
violations
}

fn get_checkers(
Expand Down
26 changes: 13 additions & 13 deletions src/packs/checker/architecture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,32 +117,32 @@ impl CheckerInterface for Checker {
&self,
reference: &Reference,
configuration: &Configuration,
) -> Option<Violation> {
) -> anyhow::Result<Option<Violation>> {
let pack_set = &configuration.pack_set;

let referencing_pack = &reference.referencing_pack(pack_set);

let relative_defining_file = &reference.relative_defining_file;

let referencing_pack_name = &referencing_pack.name;
let defining_pack = &reference.defining_pack(pack_set);
let defining_pack = &reference.defining_pack(pack_set)?;
if defining_pack.is_none() {
return None;
return Ok(None);
}
let defining_pack = defining_pack.unwrap();

if referencing_pack.enforce_architecture().is_false() {
return None;
return Ok(None);
}

let defining_pack_name = &defining_pack.name;

if relative_defining_file.is_none() {
return None;
return Ok(None);
}

if referencing_pack_name == defining_pack_name {
return None;
return Ok(None);
}

match (&referencing_pack.layer, &defining_pack.layer) {
Expand All @@ -152,7 +152,7 @@ impl CheckerInterface for Checker {
.can_depend_on(referencing_layer, defining_layer)
.unwrap()
{
return None;
return Ok(None);
}

let message = format!(
Expand All @@ -177,12 +177,12 @@ impl CheckerInterface for Checker {
defining_pack_name: defining_pack_name.clone(),
};

Some(Violation {
Ok(Some(Violation {
message,
identifier,
})
}))
}
_ => None,
_ => Ok(None),
}
}

Expand Down Expand Up @@ -262,7 +262,7 @@ mod tests {
.unwrap(),
..Configuration::default()
};
assert_eq!(None, checker.check(&reference, &configuration))
assert_eq!(None, checker.check(&reference, &configuration).unwrap())
}

#[test]
Expand Down Expand Up @@ -330,7 +330,7 @@ mod tests {
};
assert_eq!(
expected_violation,
checker.check(&reference, &configuration).unwrap()
checker.check(&reference, &configuration).unwrap().unwrap()
)
}

Expand Down Expand Up @@ -387,7 +387,7 @@ mod tests {
..Configuration::default()
};

assert_eq!(None, checker.check(&reference, &configuration))
assert_eq!(None, checker.check(&reference, &configuration).unwrap())
}

struct ArchitectureTestCase {
Expand Down
23 changes: 12 additions & 11 deletions src/packs/checker/dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,26 +109,27 @@ impl CheckerInterface for Checker {
&self,
reference: &Reference,
configuration: &Configuration,
) -> Option<Violation> {
) -> anyhow::Result<Option<Violation>> {
let referencing_pack =
reference.referencing_pack(&configuration.pack_set);

if referencing_pack.enforce_dependencies().is_false() {
return None;
return Ok(None);
}

let referencing_pack_name = &referencing_pack.name;
let defining_pack = &reference.defining_pack(&configuration.pack_set);
let defining_pack =
&reference.defining_pack(&configuration.pack_set)?;

if defining_pack.is_none() {
return None;
return Ok(None);
}

let defining_pack = defining_pack.unwrap();

let defining_pack_name = &defining_pack.name;
if referencing_pack_name == defining_pack_name {
return None;
return Ok(None);
}

let referencing_pack_dependencies = &referencing_pack.dependencies;
Expand Down Expand Up @@ -170,13 +171,13 @@ impl CheckerInterface for Checker {
defining_pack_name: defining_pack_name.clone(),
};

return Some(Violation {
return Ok(Some(Violation {
message,
identifier,
});
}));
}

None
Ok(None)
}

fn is_strict_mode_violation(
Expand Down Expand Up @@ -224,7 +225,7 @@ mod tests {
)),
source_location: SourceLocation { line: 3, column: 1 },
};
assert_eq!(None, checker.check(&reference, &configuration))
assert_eq!(None, checker.check(&reference, &configuration).unwrap())
}

#[test]
Expand All @@ -251,7 +252,7 @@ mod tests {
};
assert_eq!(
expected_violation,
checker.check(&reference, &configuration).unwrap()
checker.check(&reference, &configuration).unwrap().unwrap()
)
}

Expand All @@ -267,7 +268,7 @@ mod tests {
.unwrap();
let reference = build_foo_reference_bar_reference();

assert_eq!(checker.check(&reference, &configuration), None)
assert_eq!(checker.check(&reference, &configuration).unwrap(), None)
}

fn build_foo_reference_bar_reference() -> Reference {
Expand Down
14 changes: 7 additions & 7 deletions src/packs/checker/folder_visibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ impl CheckerInterface for Checker {
&self,
reference: &Reference,
configuration: &Configuration,
) -> Option<Violation> {
) -> anyhow::Result<Option<Violation>> {
let pack_set = &configuration.pack_set;
let referencing_pack = &reference.referencing_pack(pack_set);
let relative_defining_file = &reference.relative_defining_file;
if relative_defining_file.is_none() {
return None;
return Ok(None);
}
let defining_pack = &reference.defining_pack(pack_set);
let defining_pack = &reference.defining_pack(pack_set)?;
if defining_pack.is_none() {
return None;
return Ok(None);
}
let defining_pack = defining_pack.unwrap();
if !folder_visible(referencing_pack, defining_pack).unwrap() {
Expand All @@ -40,12 +40,12 @@ impl CheckerInterface for Checker {
referencing_pack_name: referencing_pack.name.clone(),
defining_pack_name: defining_pack.name.clone(),
};
Some(Violation {
Ok(Some(Violation {
message,
identifier,
})
}))
} else {
None
Ok(None)
}
}

Expand Down
Loading
Loading