diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-10 20:15:41 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-10 20:15:41 +0000 |
commit | ffd407affff967884fd51a977335469e819c7194 (patch) | |
tree | de0f95ec9e49ee97148047622e333353f24c1433 /crates/ra_hir/src/code_model_api.rs | |
parent | b952c270ee87cc36500b3bb03bab9268f2184d1a (diff) | |
parent | 2f24e740db3365afac56aad3e8a533340369ef7d (diff) |
Merge #778
778: Glob imports r=matklad a=flodiebold
This implements glob imports, completing #231 :)
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_api.rs')
-rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index 19f103855..94a08aa63 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
@@ -327,7 +327,7 @@ impl Enum { | |||
327 | db.enum_data(*self).name.clone() | 327 | db.enum_data(*self).name.clone() |
328 | } | 328 | } |
329 | 329 | ||
330 | pub fn variants(&self, db: &impl HirDatabase) -> Vec<EnumVariant> { | 330 | pub fn variants(&self, db: &impl PersistentHirDatabase) -> Vec<EnumVariant> { |
331 | db.enum_data(*self) | 331 | db.enum_data(*self) |
332 | .variants | 332 | .variants |
333 | .iter() | 333 | .iter() |
@@ -389,7 +389,7 @@ impl EnumVariant { | |||
389 | self.parent | 389 | self.parent |
390 | } | 390 | } |
391 | 391 | ||
392 | pub fn name(&self, db: &impl HirDatabase) -> Option<Name> { | 392 | pub fn name(&self, db: &impl PersistentHirDatabase) -> Option<Name> { |
393 | db.enum_data(self.parent).variants[self.id].name.clone() | 393 | db.enum_data(self.parent).variants[self.id].name.clone() |
394 | } | 394 | } |
395 | 395 | ||