language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fought against clippy and lost

Browse source
This commit is contained in:
Ayaz Hafiz 2022-04-22 15:30:55 -04:00
parent 7d908dc99c
commit 17e7b10267
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/solve/src/solve.rs
View file

@ -1222,11 +1222,16 @@ fn solve(
let real_content = subs.get_content_without_compacting(real_var);
let branches_content = subs.get_content_without_compacting(branches_var);
let already_have_error = match (real_content, branches_content) {
(Content::Error | Content::Structure(FlatType::Erroneous(_)), _) => true,
(_, Content::Error | Content::Structure(FlatType::Erroneous(_))) => true,
_ => false,
};
let already_have_error = matches!(
(real_content, branches_content),
(
Content::Error | Content::Structure(FlatType::Erroneous(_)),
_
) | (
_,
Content::Error | Content::Structure(FlatType::Erroneous(_))
)
);
let snapshot = subs.snapshot();
let outcome = unify(subs, real_var, branches_var, Mode::EQ);
@ -1303,7 +1308,7 @@ fn solve(
let sketched_rows = constraints.sketched_rows[sketched_rows.index()].clone();
if should_check_exhaustiveness {
let checked = roc_can::exhaustive::check(&subs, sketched_rows, context);
let checked = roc_can::exhaustive::check(subs, sketched_rows, context);
if let Err(errors) = checked {
problems.extend(errors.into_iter().map(TypeError::Exhaustive));
}