diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-29 20:40:29 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-29 20:40:29 +0000 |
commit | 5e78036e6c8752fda350818afdd411ab25f405ce (patch) | |
tree | e099bb9e9c04392dcb7fed54200a989f663f3659 /crates/ra_ide/src/impls.rs | |
parent | e91320632a9dfee937c3c2ba3ffafd3f5ffb22dc (diff) | |
parent | a1e18695548b5cd6661f26a985b34c8b105e1896 (diff) |
Merge #3379
3379: Rename ast::ImplBlock -> ast::ImplDef r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/impls.rs')
-rw-r--r-- | crates/ra_ide/src/impls.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/crates/ra_ide/src/impls.rs b/crates/ra_ide/src/impls.rs index bf82b2a16..68529c8a5 100644 --- a/crates/ra_ide/src/impls.rs +++ b/crates/ra_ide/src/impls.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use hir::{Crate, ImplBlock, Semantics}; | 3 | use hir::{Crate, ImplDef, Semantics}; |
4 | use ra_ide_db::RootDatabase; | 4 | use ra_ide_db::RootDatabase; |
5 | use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; | 5 | use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; |
6 | 6 | ||
@@ -42,12 +42,12 @@ fn impls_for_def( | |||
42 | ast::NominalDef::UnionDef(def) => sema.to_def(def)?.ty(sema.db), | 42 | ast::NominalDef::UnionDef(def) => sema.to_def(def)?.ty(sema.db), |
43 | }; | 43 | }; |
44 | 44 | ||
45 | let impls = ImplBlock::all_in_crate(sema.db, krate); | 45 | let impls = ImplDef::all_in_crate(sema.db, krate); |
46 | 46 | ||
47 | Some( | 47 | Some( |
48 | impls | 48 | impls |
49 | .into_iter() | 49 | .into_iter() |
50 | .filter(|impl_block| ty.is_equal_for_find_impls(&impl_block.target_ty(sema.db))) | 50 | .filter(|impl_def| ty.is_equal_for_find_impls(&impl_def.target_ty(sema.db))) |
51 | .map(|imp| imp.to_nav(sema.db)) | 51 | .map(|imp| imp.to_nav(sema.db)) |
52 | .collect(), | 52 | .collect(), |
53 | ) | 53 | ) |
@@ -60,7 +60,7 @@ fn impls_for_trait( | |||
60 | ) -> Option<Vec<NavigationTarget>> { | 60 | ) -> Option<Vec<NavigationTarget>> { |
61 | let tr = sema.to_def(node)?; | 61 | let tr = sema.to_def(node)?; |
62 | 62 | ||
63 | let impls = ImplBlock::for_trait(sema.db, krate, tr); | 63 | let impls = ImplDef::for_trait(sema.db, krate, tr); |
64 | 64 | ||
65 | Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect()) | 65 | Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect()) |
66 | } | 66 | } |
@@ -86,7 +86,7 @@ mod tests { | |||
86 | struct Foo<|>; | 86 | struct Foo<|>; |
87 | impl Foo {} | 87 | impl Foo {} |
88 | ", | 88 | ", |
89 | &["impl IMPL_BLOCK FileId(1) [12; 23)"], | 89 | &["impl IMPL_DEF FileId(1) [12; 23)"], |
90 | ); | 90 | ); |
91 | } | 91 | } |
92 | 92 | ||
@@ -99,7 +99,7 @@ mod tests { | |||
99 | impl Foo {} | 99 | impl Foo {} |
100 | impl Foo {} | 100 | impl Foo {} |
101 | ", | 101 | ", |
102 | &["impl IMPL_BLOCK FileId(1) [12; 23)", "impl IMPL_BLOCK FileId(1) [24; 35)"], | 102 | &["impl IMPL_DEF FileId(1) [12; 23)", "impl IMPL_DEF FileId(1) [24; 35)"], |
103 | ); | 103 | ); |
104 | } | 104 | } |
105 | 105 | ||
@@ -116,7 +116,7 @@ mod tests { | |||
116 | impl super::Foo {} | 116 | impl super::Foo {} |
117 | } | 117 | } |
118 | ", | 118 | ", |
119 | &["impl IMPL_BLOCK FileId(1) [24; 42)", "impl IMPL_BLOCK FileId(1) [57; 75)"], | 119 | &["impl IMPL_DEF FileId(1) [24; 42)", "impl IMPL_DEF FileId(1) [57; 75)"], |
120 | ); | 120 | ); |
121 | } | 121 | } |
122 | 122 | ||
@@ -133,7 +133,7 @@ mod tests { | |||
133 | //- /b.rs | 133 | //- /b.rs |
134 | impl crate::Foo {} | 134 | impl crate::Foo {} |
135 | ", | 135 | ", |
136 | &["impl IMPL_BLOCK FileId(2) [0; 18)", "impl IMPL_BLOCK FileId(3) [0; 18)"], | 136 | &["impl IMPL_DEF FileId(2) [0; 18)", "impl IMPL_DEF FileId(3) [0; 18)"], |
137 | ); | 137 | ); |
138 | } | 138 | } |
139 | 139 | ||
@@ -146,7 +146,7 @@ mod tests { | |||
146 | struct Foo; | 146 | struct Foo; |
147 | impl T for Foo {} | 147 | impl T for Foo {} |
148 | ", | 148 | ", |
149 | &["impl IMPL_BLOCK FileId(1) [23; 40)"], | 149 | &["impl IMPL_DEF FileId(1) [23; 40)"], |
150 | ); | 150 | ); |
151 | } | 151 | } |
152 | 152 | ||
@@ -164,7 +164,7 @@ mod tests { | |||
164 | //- /b.rs | 164 | //- /b.rs |
165 | impl crate::T for crate::Foo {} | 165 | impl crate::T for crate::Foo {} |
166 | ", | 166 | ", |
167 | &["impl IMPL_BLOCK FileId(2) [0; 31)", "impl IMPL_BLOCK FileId(3) [0; 31)"], | 167 | &["impl IMPL_DEF FileId(2) [0; 31)", "impl IMPL_DEF FileId(3) [0; 31)"], |
168 | ); | 168 | ); |
169 | } | 169 | } |
170 | 170 | ||
@@ -180,9 +180,9 @@ mod tests { | |||
180 | impl T for &Foo {} | 180 | impl T for &Foo {} |
181 | ", | 181 | ", |
182 | &[ | 182 | &[ |
183 | "impl IMPL_BLOCK FileId(1) [23; 34)", | 183 | "impl IMPL_DEF FileId(1) [23; 34)", |
184 | "impl IMPL_BLOCK FileId(1) [35; 52)", | 184 | "impl IMPL_DEF FileId(1) [35; 52)", |
185 | "impl IMPL_BLOCK FileId(1) [53; 71)", | 185 | "impl IMPL_DEF FileId(1) [53; 71)", |
186 | ], | 186 | ], |
187 | ); | 187 | ); |
188 | } | 188 | } |
@@ -195,7 +195,7 @@ mod tests { | |||
195 | #[derive(Copy)] | 195 | #[derive(Copy)] |
196 | struct Foo<|>; | 196 | struct Foo<|>; |
197 | ", | 197 | ", |
198 | &["impl IMPL_BLOCK FileId(1) [0; 15)"], | 198 | &["impl IMPL_DEF FileId(1) [0; 15)"], |
199 | ); | 199 | ); |
200 | } | 200 | } |
201 | } | 201 | } |