diff options
author | Aleksey Kladov <[email protected]> | 2019-10-30 15:56:20 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-10-30 15:56:20 +0000 |
commit | 872ac566bfc6cf43ac55354cf5223b962dbc1d92 (patch) | |
tree | 187da15a51e06cd3936d3f8c8e823f70c363a555 /crates/ra_hir_def/src/path.rs | |
parent | b05d6e53fb0e9a008dc2e1220b1201818e63ed2d (diff) |
push name down to hir_expand
Diffstat (limited to 'crates/ra_hir_def/src/path.rs')
-rw-r--r-- | crates/ra_hir_def/src/path.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs index 8d57e7761..d0b842a6b 100644 --- a/crates/ra_hir_def/src/path.rs +++ b/crates/ra_hir_def/src/path.rs | |||
@@ -2,19 +2,17 @@ | |||
2 | 2 | ||
3 | use std::{iter, sync::Arc}; | 3 | use std::{iter, sync::Arc}; |
4 | 4 | ||
5 | use hir_expand::either::Either; | 5 | use hir_expand::{ |
6 | either::Either, | ||
7 | name::{self, AsName, Name}, | ||
8 | }; | ||
6 | use ra_db::CrateId; | 9 | use ra_db::CrateId; |
7 | use ra_syntax::{ | 10 | use ra_syntax::{ |
8 | ast::{self, NameOwner, TypeAscriptionOwner}, | 11 | ast::{self, NameOwner, TypeAscriptionOwner}, |
9 | AstNode, | 12 | AstNode, |
10 | }; | 13 | }; |
11 | 14 | ||
12 | use crate::{ | 15 | use crate::{hygiene::Hygiene, type_ref::TypeRef, Source}; |
13 | hygiene::Hygiene, | ||
14 | name::{self, AsName, Name}, | ||
15 | type_ref::TypeRef, | ||
16 | Source, | ||
17 | }; | ||
18 | 16 | ||
19 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 17 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
20 | pub struct Path { | 18 | pub struct Path { |
@@ -392,8 +390,9 @@ fn convert_path(prefix: Option<Path>, path: ast::Path, hygiene: &Hygiene) -> Opt | |||
392 | } | 390 | } |
393 | 391 | ||
394 | pub mod known { | 392 | pub mod known { |
393 | use hir_expand::name; | ||
394 | |||
395 | use super::{Path, PathKind}; | 395 | use super::{Path, PathKind}; |
396 | use crate::name; | ||
397 | 396 | ||
398 | pub fn std_iter_into_iterator() -> Path { | 397 | pub fn std_iter_into_iterator() -> Path { |
399 | Path::from_simple_segments( | 398 | Path::from_simple_segments( |