diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-06 08:57:00 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-06 08:57:00 +0100 |
| commit | c4d128e454448191c4b21d8e151c673e4c42376e (patch) | |
| tree | 17cf5bbf429642c52708cd0d3c1d8885b63543f0 /crates/ra_hir | |
| parent | 0bf02f5ccac99c91f10ef46bb06ff2ea316c382c (diff) | |
| parent | 30eb458b4fa8adcecd8cbf731bd1cfa9a7a8b88b (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into fix_4311
Diffstat (limited to 'crates/ra_hir')
| -rw-r--r-- | crates/ra_hir/src/code_model.rs | 2 |
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, |