diff options
author | Florian Diebold <[email protected]> | 2019-09-16 21:01:13 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-09-17 18:47:45 +0100 |
commit | a040fde3ae5e339199237f24a7461812e74475bf (patch) | |
tree | 007e93e160cd6f0c5e62a4ed4ac72e8f6f8bf76b /crates/ra_hir/src/ty/traits | |
parent | 53a932509dbb9dfdaabb27a0d7fc3fe87e44ec55 (diff) |
Remove TraitItem and ImplItem in favor of AssocItem
Diffstat (limited to 'crates/ra_hir/src/ty/traits')
-rw-r--r-- | crates/ra_hir/src/ty/traits/chalk.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs index c748e9d84..693d9b28f 100644 --- a/crates/ra_hir/src/ty/traits/chalk.rs +++ b/crates/ra_hir/src/ty/traits/chalk.rs | |||
@@ -21,7 +21,7 @@ use crate::{ | |||
21 | ApplicationTy, CallableDef, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, | 21 | ApplicationTy, CallableDef, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, |
22 | TypeWalk, | 22 | TypeWalk, |
23 | }, | 23 | }, |
24 | Crate, HasGenericParams, ImplBlock, ImplItem, Trait, TypeAlias, | 24 | AssocItem, Crate, HasGenericParams, ImplBlock, Trait, TypeAlias, |
25 | }; | 25 | }; |
26 | 26 | ||
27 | /// This represents a trait whose name we could not resolve. | 27 | /// This represents a trait whose name we could not resolve. |
@@ -496,7 +496,7 @@ pub(crate) fn trait_datum_query( | |||
496 | .items(db) | 496 | .items(db) |
497 | .into_iter() | 497 | .into_iter() |
498 | .filter_map(|trait_item| match trait_item { | 498 | .filter_map(|trait_item| match trait_item { |
499 | crate::traits::TraitItem::TypeAlias(type_alias) => Some(type_alias), | 499 | crate::AssocItem::TypeAlias(type_alias) => Some(type_alias), |
500 | _ => None, | 500 | _ => None, |
501 | }) | 501 | }) |
502 | .map(|type_alias| type_alias.to_chalk(db)) | 502 | .map(|type_alias| type_alias.to_chalk(db)) |
@@ -616,7 +616,7 @@ pub(crate) fn impl_datum_query( | |||
616 | .items(db) | 616 | .items(db) |
617 | .into_iter() | 617 | .into_iter() |
618 | .filter_map(|item| match item { | 618 | .filter_map(|item| match item { |
619 | ImplItem::TypeAlias(t) => Some(t), | 619 | AssocItem::TypeAlias(t) => Some(t), |
620 | _ => None, | 620 | _ => None, |
621 | }) | 621 | }) |
622 | .filter_map(|t| { | 622 | .filter_map(|t| { |