language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: unify types in infer_expr_coerce_never()

Browse source
This commit is contained in:
Ryo Yoshida 2023-04-07 05:17:12 +09:00
parent 625a6f37de
commit 5ab4e64a4c
No known key found for this signature in database
GPG key ID: E25698A930586171
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/hir-ty/src/infer/expr.rs
View file

@ -86,10 +86,10 @@ impl<'a> InferenceContext<'a> {
} }
} }
pub(super) fn infer_expr_coerce_never(&mut self, expr: ExprId, expected: &Expectation) -> Ty { fn infer_expr_coerce_never(&mut self, expr: ExprId, expected: &Expectation) -> Ty {
let ty = self.infer_expr_inner(expr, expected); let ty = self.infer_expr_inner(expr, expected);
// While we don't allow *arbitrary* coercions here, we *do* allow // While we don't allow *arbitrary* coercions here, we *do* allow
// coercions from ! to `expected`. // coercions from `!` to `expected`.
if ty.is_never() { if ty.is_never() {
if let Some(adjustments) = self.result.expr_adjustments.get(&expr) { if let Some(adjustments) = self.result.expr_adjustments.get(&expr) {
return if let [Adjustment { kind: Adjust::NeverToAny, target }] = &**adjustments { return if let [Adjustment { kind: Adjust::NeverToAny, target }] = &**adjustments {
@ -99,13 +99,22 @@ impl<'a> InferenceContext<'a> {
}; };
} }
let adj_ty = self.table.new_type_var(); if let Some(target) = expected.only_has_type(&mut self.table) {
self.write_expr_adj( self.coerce(Some(expr), &ty, &target)
expr, .expect("never-to-any coercion should always succeed")
vec![Adjustment { kind: Adjust::NeverToAny, target: adj_ty.clone() }], } else {
); ty
adj_ty }
} else { } else {
if let Some(expected_ty) = expected.only_has_type(&mut self.table) {
let could_unify = self.unify(&ty, &expected_ty);
if !could_unify {
self.result.type_mismatches.insert(
expr.into(),
TypeMismatch { expected: expected_ty, actual: ty.clone() },
);
}
}
ty ty
} }
} }

2
crates/hir-ty/src/tests/patterns.rs
View file

@ -476,7 +476,7 @@ fn infer_adt_pattern() {
183..184 'x': usize 183..184 'x': usize
190..191 'x': usize 190..191 'x': usize
201..205 'E::B': E 201..205 'E::B': E
209..212 'foo': {unknown} 209..212 'foo': bool
216..217 '1': usize 216..217 '1': usize
227..231 'E::B': E 227..231 'E::B': E
235..237 '10': usize 235..237 '10': usize

4
crates/hir-ty/src/tests/regression.rs
View file

@ -270,7 +270,7 @@ fn infer_std_crash_5() {
61..320 '{ ... }': () 61..320 '{ ... }': ()
75..79 'name': &{unknown} 75..79 'name': &{unknown}
82..166 'if doe... }': &{unknown} 82..166 'if doe... }': &{unknown}
85..98 'doesnt_matter': {unknown} 85..98 'doesnt_matter': bool
99..128 '{ ... }': &{unknown} 99..128 '{ ... }': &{unknown}
113..118 'first': &{unknown} 113..118 'first': &{unknown}
134..166 '{ ... }': &{unknown} 134..166 '{ ... }': &{unknown}
@ -279,7 +279,7 @@ fn infer_std_crash_5() {
181..188 'content': &{unknown} 181..188 'content': &{unknown}
191..313 'if ICE... }': &{unknown} 191..313 'if ICE... }': &{unknown}
194..231 'ICE_RE..._VALUE': {unknown} 194..231 'ICE_RE..._VALUE': {unknown}
194..247 'ICE_RE...&name)': {unknown} 194..247 'ICE_RE...&name)': bool
241..246 '&name': &&{unknown} 241..246 '&name': &&{unknown}
242..246 'name': &{unknown} 242..246 'name': &{unknown}
248..276 '{ ... }': &{unknown} 248..276 '{ ... }': &{unknown}