diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-20 16:09:51 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-20 16:09:51 +0100 |
| commit | 1c24f57ef8420e924e904ec481e7c6471f3ddcc8 (patch) | |
| tree | c7f1ebcc5979838d1747cf19dd562004916a7274 /crates/hir | |
| parent | be762ccccd5a86632e60351518528d078785a3e2 (diff) | |
| parent | 3b1a648539487c08bc613b6fd6e573b0e0e38948 (diff) | |
Merge #6295
6295: More type safety around names r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir')
| -rw-r--r-- | crates/hir/src/code_model.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index b65be4fe1..7f169ccd2 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | use std::{iter, sync::Arc}; | 2 | use std::{iter, sync::Arc}; |
| 3 | 3 | ||
| 4 | use arrayvec::ArrayVec; | 4 | use arrayvec::ArrayVec; |
| 5 | use base_db::{CrateId, CrateName, Edition, FileId}; | 5 | use base_db::{CrateDisplayName, CrateId, Edition, FileId}; |
| 6 | use either::Either; | 6 | use either::Either; |
| 7 | use hir_def::find_path::PrefixKind; | 7 | use hir_def::find_path::PrefixKind; |
| 8 | use hir_def::{ | 8 | use hir_def::{ |
| @@ -103,8 +103,8 @@ impl Crate { | |||
| 103 | db.crate_graph()[self.id].edition | 103 | db.crate_graph()[self.id].edition |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | pub fn declaration_name(self, db: &dyn HirDatabase) -> Option<CrateName> { | 106 | pub fn display_name(self, db: &dyn HirDatabase) -> Option<CrateDisplayName> { |
| 107 | db.crate_graph()[self.id].declaration_name.clone() | 107 | db.crate_graph()[self.id].display_name.clone() |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | pub fn query_external_importables( | 110 | pub fn query_external_importables( |