diff options
Diffstat (limited to 'crates/ra_hir_def/src/adt.rs')
-rw-r--r-- | crates/ra_hir_def/src/adt.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index 9ab829aab..db3e63ef8 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use either::Either; | ||
5 | use hir_expand::{ | 6 | use hir_expand::{ |
6 | either::Either, | ||
7 | name::{AsName, Name}, | 7 | name::{AsName, Name}, |
8 | InFile, | 8 | InFile, |
9 | }; | 9 | }; |
@@ -184,7 +184,7 @@ fn lower_struct( | |||
184 | ast::StructKind::Tuple(fl) => { | 184 | ast::StructKind::Tuple(fl) => { |
185 | for (i, fd) in fl.fields().enumerate() { | 185 | for (i, fd) in fl.fields().enumerate() { |
186 | trace.alloc( | 186 | trace.alloc( |
187 | || Either::A(fd.clone()), | 187 | || Either::Left(fd.clone()), |
188 | || StructFieldData { | 188 | || StructFieldData { |
189 | name: Name::new_tuple_field(i), | 189 | name: Name::new_tuple_field(i), |
190 | type_ref: TypeRef::from_ast_opt(fd.type_ref()), | 190 | type_ref: TypeRef::from_ast_opt(fd.type_ref()), |
@@ -196,7 +196,7 @@ fn lower_struct( | |||
196 | ast::StructKind::Record(fl) => { | 196 | ast::StructKind::Record(fl) => { |
197 | for fd in fl.fields() { | 197 | for fd in fl.fields() { |
198 | trace.alloc( | 198 | trace.alloc( |
199 | || Either::B(fd.clone()), | 199 | || Either::Right(fd.clone()), |
200 | || StructFieldData { | 200 | || StructFieldData { |
201 | name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), | 201 | name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), |
202 | type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), | 202 | type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), |