aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/code_model.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-05 17:13:57 +0100
committerGitHub <[email protected]>2020-05-05 17:13:57 +0100
commit58f64313fdbb215b29cceb843e06d2c1541d9f56 (patch)
tree0c95a20510f832ec5f208a1ede39f8aad8ffcd86 /crates/ra_hir/src/code_model.rs
parent756e91732b7a92d9156f5c1d8ffcaf5155cf4680 (diff)
parent92665358cd98913e3fef8294e1889cc0bb919e3f (diff)
Merge #4321
4321: Rename ImplItem to AssocItem r=matklad a=edwin0cheng Related discussion: https://github.com/rust-analyzer/rust-analyzer/pull/4283#discussion_r419352265 Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
-rw-r--r--crates/ra_hir/src/code_model.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index a004363ee..5f480c304 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -1211,7 +1211,7 @@ impl Type {
1211 1211
1212 // This would be nicer if it just returned an iterator, but that runs into 1212 // This would be nicer if it just returned an iterator, but that runs into
1213 // lifetime problems, because we need to borrow temp `CrateImplDefs`. 1213 // lifetime problems, because we need to borrow temp `CrateImplDefs`.
1214 pub fn iterate_impl_items<T>( 1214 pub fn iterate_assoc_items<T>(
1215 self, 1215 self,
1216 db: &dyn HirDatabase, 1216 db: &dyn HirDatabase,
1217 krate: Crate, 1217 krate: Crate,