diff options
Diffstat (limited to 'crates/ra_hir_def/src/path.rs')
-rw-r--r-- | crates/ra_hir_def/src/path.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs index 36ad27867..c1376af36 100644 --- a/crates/ra_hir_def/src/path.rs +++ b/crates/ra_hir_def/src/path.rs | |||
@@ -6,7 +6,7 @@ use std::{iter, sync::Arc}; | |||
6 | use either::Either; | 6 | use either::Either; |
7 | use hir_expand::{ | 7 | use hir_expand::{ |
8 | hygiene::Hygiene, | 8 | hygiene::Hygiene, |
9 | name::{AsName, Name, N}, | 9 | name::{name, AsName, Name}, |
10 | }; | 10 | }; |
11 | use ra_db::CrateId; | 11 | use ra_db::CrateId; |
12 | use ra_syntax::{ | 12 | use ra_syntax::{ |
@@ -276,7 +276,7 @@ impl GenericArgs { | |||
276 | } | 276 | } |
277 | if let Some(ret_type) = ret_type { | 277 | if let Some(ret_type) = ret_type { |
278 | let type_ref = TypeRef::from_ast_opt(ret_type.type_ref()); | 278 | let type_ref = TypeRef::from_ast_opt(ret_type.type_ref()); |
279 | bindings.push((N![Output], type_ref)) | 279 | bindings.push((name![Output], type_ref)) |
280 | } | 280 | } |
281 | if args.is_empty() && bindings.is_empty() { | 281 | if args.is_empty() && bindings.is_empty() { |
282 | None | 282 | None |
@@ -297,12 +297,12 @@ impl From<Name> for Path { | |||
297 | } | 297 | } |
298 | 298 | ||
299 | pub mod known { | 299 | pub mod known { |
300 | use hir_expand::name::N; | 300 | use hir_expand::name::name; |
301 | 301 | ||
302 | use super::{Path, PathKind}; | 302 | use super::{Path, PathKind}; |
303 | 303 | ||
304 | macro_rules! P { | 304 | macro_rules! P { |
305 | ($start:ident $(:: $seg:ident)*) => { Path::from_simple_segments(PathKind::Abs, vec![N![$start], $(N![$seg],)*]) }; | 305 | ($start:ident $(:: $seg:ident)*) => { Path::from_simple_segments(PathKind::Abs, vec![name![$start], $(name![$seg],)*]) }; |
306 | } | 306 | } |
307 | 307 | ||
308 | pub fn std_iter_into_iterator() -> Path { | 308 | pub fn std_iter_into_iterator() -> Path { |