diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-26 18:07:21 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-26 18:07:21 +0000 |
commit | 141fca60061d85494fcb719a4c8237eaf6c7c134 (patch) | |
tree | 6a7abab05196f1cd3bc2185ab7f02ac89e413c69 /crates/ra_hir/src/ty/utils.rs | |
parent | 3b0fc8ac6224e8ab8848de791011add6a149b9d4 (diff) | |
parent | 4e415a269e2d821f31963c05843517c6fde0132d (diff) |
Merge #2419
2419: Remove ns-polymorphic type_for_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/utils.rs')
-rw-r--r-- | crates/ra_hir/src/ty/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/utils.rs b/crates/ra_hir/src/ty/utils.rs index 52994b9e3..80ffceb4b 100644 --- a/crates/ra_hir/src/ty/utils.rs +++ b/crates/ra_hir/src/ty/utils.rs | |||
@@ -33,7 +33,7 @@ fn direct_super_traits(db: &impl DefDatabase, trait_: TraitId) -> Vec<TraitId> { | |||
33 | 33 | ||
34 | /// Returns an iterator over the whole super trait hierarchy (including the | 34 | /// Returns an iterator over the whole super trait hierarchy (including the |
35 | /// trait itself). | 35 | /// trait itself). |
36 | pub(crate) fn all_super_traits(db: &impl DefDatabase, trait_: TraitId) -> Vec<TraitId> { | 36 | pub(super) fn all_super_traits(db: &impl DefDatabase, trait_: TraitId) -> Vec<TraitId> { |
37 | // we need to take care a bit here to avoid infinite loops in case of cycles | 37 | // we need to take care a bit here to avoid infinite loops in case of cycles |
38 | // (i.e. if we have `trait A: B; trait B: A;`) | 38 | // (i.e. if we have `trait A: B; trait B: A;`) |
39 | let mut result = vec![trait_]; | 39 | let mut result = vec![trait_]; |
@@ -52,7 +52,7 @@ pub(crate) fn all_super_traits(db: &impl DefDatabase, trait_: TraitId) -> Vec<Tr | |||
52 | result | 52 | result |
53 | } | 53 | } |
54 | 54 | ||
55 | pub(crate) fn associated_type_by_name_including_super_traits( | 55 | pub(super) fn associated_type_by_name_including_super_traits( |
56 | db: &impl DefDatabase, | 56 | db: &impl DefDatabase, |
57 | trait_: TraitId, | 57 | trait_: TraitId, |
58 | name: &Name, | 58 | name: &Name, |