diff options
author | Otavio Salvador <[email protected]> | 2020-07-11 23:28:07 +0100 |
---|---|---|
committer | Otavio Salvador <[email protected]> | 2020-07-11 23:30:02 +0100 |
commit | 9d114b9707fd3d6aaa3224cd1794e8e49e433f36 (patch) | |
tree | 5fbe27386e7805717f68f77252f98d12905f9798 | |
parent | 02efda91d0fa856f0a2d33e9370147123c06abe7 (diff) |
infer: Add type inference support for Union types
This adds the type inference to Union types and add a small test case
for it, ensuring it keeps working in future.
Fixes: #5277
Signed-off-by: Otavio Salvador <[email protected]>
-rw-r--r-- | crates/ra_hir_ty/src/infer/expr.rs | 11 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/tests/simple.rs | 23 |
2 files changed, 32 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 06baac2a9..bd9a387f5 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs | |||
@@ -405,8 +405,15 @@ impl<'a> InferenceContext<'a> { | |||
405 | .subst(&a_ty.parameters) | 405 | .subst(&a_ty.parameters) |
406 | }) | 406 | }) |
407 | } | 407 | } |
408 | // FIXME: | 408 | TypeCtor::Adt(AdtId::UnionId(u)) => { |
409 | TypeCtor::Adt(AdtId::UnionId(_)) => None, | 409 | self.db.union_data(u).variant_data.field(name).map(|local_id| { |
410 | let field = FieldId { parent: u.into(), local_id }; | ||
411 | self.write_field_resolution(tgt_expr, field); | ||
412 | self.db.field_types(u.into())[field.local_id] | ||
413 | .clone() | ||
414 | .subst(&a_ty.parameters) | ||
415 | }) | ||
416 | } | ||
410 | _ => None, | 417 | _ => None, |
411 | }, | 418 | }, |
412 | _ => None, | 419 | _ => None, |
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs index de63f4cce..6d3e264af 100644 --- a/crates/ra_hir_ty/src/tests/simple.rs +++ b/crates/ra_hir_ty/src/tests/simple.rs | |||
@@ -325,6 +325,29 @@ fn test() { | |||
325 | } | 325 | } |
326 | 326 | ||
327 | #[test] | 327 | #[test] |
328 | fn infer_union() { | ||
329 | assert_snapshot!( | ||
330 | infer(r#" | ||
331 | union MyUnion { | ||
332 | foo: u32, | ||
333 | bar: f32, | ||
334 | } | ||
335 | |||
336 | unsafe fn baz(u: MyUnion) { | ||
337 | let inner = u.foo; | ||
338 | } | ||
339 | "#), | ||
340 | @r###" | ||
341 | 61..62 'u': MyUnion | ||
342 | 73..99 '{ ...foo; }': () | ||
343 | 83..88 'inner': u32 | ||
344 | 91..92 'u': MyUnion | ||
345 | 91..96 'u.foo': u32 | ||
346 | "### | ||
347 | ); | ||
348 | } | ||
349 | |||
350 | #[test] | ||
328 | fn infer_refs() { | 351 | fn infer_refs() { |
329 | assert_snapshot!( | 352 | assert_snapshot!( |
330 | infer(r#" | 353 | infer(r#" |