diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-09 12:37:49 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-09 12:37:49 +0000 |
commit | 9d786ea221b27fbdf7c7f7beea0290db448e0611 (patch) | |
tree | 312ae071afe742011c1e396d63123729e31f9815 /crates/ra_hir/src/ty | |
parent | defc7ad772123a449f7cc384dd46d88c3a45fb53 (diff) | |
parent | 6294fd5ec9c6946bdd91f1274956c573f9f2a136 (diff) |
Merge #2198
2198: Unfork struct and union ids r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
-rw-r--r-- | crates/ra_hir/src/ty/lower.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index d26b16cb2..1fed5025e 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs | |||
@@ -665,7 +665,7 @@ fn type_for_builtin(def: BuiltinType) -> Ty { | |||
665 | } | 665 | } |
666 | 666 | ||
667 | fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig { | 667 | fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig { |
668 | let struct_data = db.struct_data(def.id); | 668 | let struct_data = db.struct_data(def.id.into()); |
669 | let fields = match struct_data.variant_data.fields() { | 669 | let fields = match struct_data.variant_data.fields() { |
670 | Some(fields) => fields, | 670 | Some(fields) => fields, |
671 | None => panic!("fn_sig_for_struct_constructor called on unit struct"), | 671 | None => panic!("fn_sig_for_struct_constructor called on unit struct"), |
@@ -681,7 +681,7 @@ fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig { | |||
681 | 681 | ||
682 | /// Build the type of a tuple struct constructor. | 682 | /// Build the type of a tuple struct constructor. |
683 | fn type_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> Ty { | 683 | fn type_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> Ty { |
684 | let struct_data = db.struct_data(def.id); | 684 | let struct_data = db.struct_data(def.id.into()); |
685 | if struct_data.variant_data.fields().is_none() { | 685 | if struct_data.variant_data.fields().is_none() { |
686 | return type_for_adt(db, def); // Unit struct | 686 | return type_for_adt(db, def); // Unit struct |
687 | } | 687 | } |