diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-22 16:00:17 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-22 16:00:17 +0000 |
| commit | 404493e9df8cc34fab5ff0c605eef7700e687e80 (patch) | |
| tree | d7ebbde67a4253cf4e827c3f4d2e8323a26ad547 /crates/ra_hir/src/ty | |
| parent | 6d42db2e51e223c9be7b6ea234521ca6f93ee95a (diff) | |
| parent | 7469d2b8631594a5ed41082f375bd4cb20538efa (diff) | |
Merge #2359
2359: Remove TraitData from API r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
| -rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index f84aae26e..f61c27218 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
| @@ -233,7 +233,7 @@ fn iterate_trait_method_candidates<T>( | |||
| 233 | .chain(traits_from_env) | 233 | .chain(traits_from_env) |
| 234 | .chain(resolver.traits_in_scope(db).into_iter().map(Trait::from)); | 234 | .chain(resolver.traits_in_scope(db).into_iter().map(Trait::from)); |
| 235 | 'traits: for t in traits { | 235 | 'traits: for t in traits { |
| 236 | let data = t.trait_data(db); | 236 | let data = db.trait_data(t.id); |
| 237 | 237 | ||
| 238 | // we'll be lazy about checking whether the type implements the | 238 | // we'll be lazy about checking whether the type implements the |
| 239 | // trait, but if we find out it doesn't, we'll skip the rest of the | 239 | // trait, but if we find out it doesn't, we'll skip the rest of the |