Auto merge of #18067 - Veykril:prevent-mir-building, r=Veykril
fix: Properly prevent mir building with unknown types present
diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs
index 0e68ab4..8bc3c50 100644
--- a/crates/hir-ty/src/infer.rs
+++ b/crates/hir-ty/src/infer.rs
@@ -708,7 +708,6 @@
tuple_field_access_types: _,
coercion_casts,
} = &mut result;
-
table.fallback_if_possible();
// Comment from rustc:
@@ -754,7 +753,7 @@
*has_errors = *has_errors || ty.contains_unknown();
}
- *has_errors = !type_mismatches.is_empty();
+ *has_errors |= !type_mismatches.is_empty();
type_mismatches.retain(|_, mismatch| {
mismatch.expected = table.resolve_completely(mismatch.expected.clone());
@@ -797,20 +796,30 @@
});
for (_, subst) in method_resolutions.values_mut() {
*subst = table.resolve_completely(subst.clone());
+ *has_errors =
+ *has_errors || subst.type_parameters(Interner).any(|ty| ty.contains_unknown());
}
for (_, subst) in assoc_resolutions.values_mut() {
*subst = table.resolve_completely(subst.clone());
+ *has_errors =
+ *has_errors || subst.type_parameters(Interner).any(|ty| ty.contains_unknown());
}
for adjustment in expr_adjustments.values_mut().flatten() {
adjustment.target = table.resolve_completely(adjustment.target.clone());
+ *has_errors = *has_errors || adjustment.target.contains_unknown();
}
for adjustment in pat_adjustments.values_mut().flatten() {
*adjustment = table.resolve_completely(adjustment.clone());
+ *has_errors = *has_errors || adjustment.contains_unknown();
}
result.tuple_field_access_types = tuple_field_accesses_rev
.into_iter()
.enumerate()
.map(|(idx, subst)| (TupleId(idx as u32), table.resolve_completely(subst)))
+ .inspect(|(_, subst)| {
+ *has_errors =
+ *has_errors || subst.type_parameters(Interner).any(|ty| ty.contains_unknown());
+ })
.collect();
result
}
diff --git a/crates/hir-ty/src/mir.rs b/crates/hir-ty/src/mir.rs
index 8cd6ae1..8e815aa 100644
--- a/crates/hir-ty/src/mir.rs
+++ b/crates/hir-ty/src/mir.rs
@@ -185,8 +185,8 @@
never!("Out of bound tuple field");
TyKind::Error.intern(Interner)
}),
- _ => {
- never!("Only tuple has tuple field");
+ ty => {
+ never!("Only tuple has tuple field: {:?}", ty);
TyKind::Error.intern(Interner)
}
},
diff --git a/crates/ide-diagnostics/src/handlers/mutability_errors.rs b/crates/ide-diagnostics/src/handlers/mutability_errors.rs
index e4b1f3c..9554279 100644
--- a/crates/ide-diagnostics/src/handlers/mutability_errors.rs
+++ b/crates/ide-diagnostics/src/handlers/mutability_errors.rs
@@ -824,13 +824,13 @@
#[test]
fn or_pattern() {
+ // FIXME: `None` is inferred as unknown here for some reason
check_diagnostics(
r#"
//- minicore: option
fn f(_: i32) {}
fn main() {
let ((Some(mut x), None) | (_, Some(mut x))) = (None, Some(7)) else { return };
- //^^^^^ 💡 warn: variable does not need to be mutable
f(x);
}
"#,
