push name down to hir_expand

This commit is contained in:
Aleksey Kladov 2019-10-30 18:56:20 +03:00
parent b05d6e53fb
commit 872ac566bf
21 changed files with 49 additions and 50 deletions

View file

@ -3,7 +3,8 @@
use std::sync::Arc;
use hir_def::{name::AsName, type_ref::TypeRef};
use hir_def::type_ref::TypeRef;
use hir_expand::name::AsName;
use ra_arena::{impl_arena_id, Arena, RawId};
use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner};

View file

@ -6,13 +6,13 @@ pub(crate) mod docs;
use std::sync::Arc;
use hir_def::{
name::{
self, AsName, BOOL, CHAR, F32, F64, I128, I16, I32, I64, I8, ISIZE, SELF_TYPE, STR, U128,
U16, U32, U64, U8, USIZE,
},
type_ref::{Mutability, TypeRef},
CrateModuleId, ModuleId,
};
use hir_expand::name::{
self, AsName, BOOL, CHAR, F32, F64, I128, I16, I32, I64, I8, ISIZE, SELF_TYPE, STR, U128, U16,
U32, U64, U8, USIZE,
};
use ra_db::{CrateId, Edition};
use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};

View file

@ -1,11 +1,7 @@
//! FIXME: write short doc here
use hir_def::{
hygiene::Hygiene,
name::{self, AsName, Name},
path::GenericArgs,
type_ref::TypeRef,
};
use hir_def::{hygiene::Hygiene, path::GenericArgs, type_ref::TypeRef};
use hir_expand::name::{self, AsName, Name};
use ra_arena::Arena;
use ra_syntax::{
ast::{

View file

@ -1,6 +1,6 @@
//! FIXME: write short doc here
use hir_def::name::AsName;
use hir_expand::name::AsName;
use ra_syntax::ast::{self, AstNode, NameOwner};
use crate::{

View file

@ -6,10 +6,10 @@
use std::sync::Arc;
use hir_def::{
name::{self, AsName},
path::Path,
type_ref::{TypeBound, TypeRef},
};
use hir_expand::name::{self, AsName};
use ra_syntax::ast::{self, DefaultTypeParamOwner, NameOwner, TypeBoundsOwner, TypeParamsOwner};
use crate::{

View file

@ -81,8 +81,7 @@ pub use crate::{
};
pub use hir_def::{
name::Name,
path::{Path, PathKind},
type_ref::Mutability,
};
pub use hir_expand::either::Either;
pub use hir_expand::{either::Either, name::Name};

View file

@ -1,6 +1,7 @@
//! FIXME: write short doc here
use hir_def::{attr::Attr, name, nameres::raw};
use hir_def::{attr::Attr, nameres::raw};
use hir_expand::name;
use ra_cfg::CfgOptions;
use ra_db::FileId;
use ra_syntax::{ast, SmolStr};

View file

@ -2,10 +2,10 @@
use std::sync::Arc;
use hir_def::{
name::{self, Name},
path::{Path, PathKind},
CrateModuleId,
};
use hir_expand::name::{self, Name};
use rustc_hash::FxHashSet;
use crate::{

View file

@ -7,7 +7,8 @@
//! purely for "IDE needs".
use std::sync::Arc;
use hir_def::{name::AsName, path::known};
use hir_def::path::known;
use hir_expand::name::AsName;
use ra_db::FileId;
use ra_syntax::{
ast::{self, AstNode},

View file

@ -2,7 +2,8 @@
use std::sync::Arc;
use hir_def::name::AsName;
use hir_expand::name::AsName;
use ra_syntax::ast::{self, NameOwner};
use rustc_hash::FxHashMap;

View file

@ -5,7 +5,7 @@
use std::iter::successors;
use hir_def::name;
use hir_expand::name;
use log::{info, warn};
use super::{traits::Solution, Canonical, Substs, Ty, TypeWalk};

View file

@ -22,10 +22,10 @@ use ena::unify::{InPlaceUnificationTable, NoError, UnifyKey, UnifyValue};
use rustc_hash::FxHashMap;
use hir_def::{
name,
path::known,
type_ref::{Mutability, TypeRef},
};
use hir_expand::name;
use ra_arena::map::ArenaMap;
use ra_prof::profile;
use test_utils::tested_by;

View file

@ -3,10 +3,8 @@
use std::iter::{repeat, repeat_with};
use std::sync::Arc;
use hir_def::{
name,
path::{GenericArg, GenericArgs},
};
use hir_def::path::{GenericArg, GenericArgs};
use hir_expand::name;
use super::{BindingMode, Expectation, InferenceContext, InferenceDiagnostic, TypeMismatch};
use crate::{

View file

@ -9,7 +9,8 @@ use chalk_ir::{
};
use chalk_rust_ir::{AssociatedTyDatum, ImplDatum, StructDatum, TraitDatum};
use hir_def::name;
use hir_expand::name;
use ra_db::salsa::{InternId, InternKey};
use super::{Canonical, ChalkContext, Impl, Obligation};

View file

@ -2,10 +2,9 @@
use std::sync::Arc;
use hir_def::{
name::{AsName, Name},
type_ref::TypeRef,
};
use hir_def::type_ref::TypeRef;
use hir_expand::name::{AsName, Name};
use ra_syntax::ast::NameOwner;
use crate::{

View file

@ -4,13 +4,15 @@
//! this moment, this is horribly incomplete and handles only `$crate`.
// Should this be moved to `hir_expand`? Seems like it.
use hir_expand::either::Either;
use hir_expand::{db::AstDatabase, HirFileId};
use hir_expand::{
db::AstDatabase,
either::Either,
name::{AsName, Name},
HirFileId,
};
use ra_db::CrateId;
use ra_syntax::ast;
use crate::name::{AsName, Name};
#[derive(Debug)]
pub struct Hygiene {
// This is what `$crate` expands to

View file

@ -9,7 +9,6 @@
pub mod db;
pub mod attr;
pub mod name;
pub mod path;
pub mod type_ref;
pub mod hygiene;

View file

@ -2,7 +2,12 @@
use std::{ops::Index, sync::Arc};
use hir_expand::{ast_id_map::AstIdMap, db::AstDatabase, either::Either};
use hir_expand::{
ast_id_map::AstIdMap,
db::AstDatabase,
either::Either,
name::{AsName, Name},
};
use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
use ra_syntax::{
ast::{self, AttrsOwner, NameOwner},
@ -10,12 +15,8 @@ use ra_syntax::{
};
use crate::{
attr::Attr,
db::DefDatabase2,
hygiene::Hygiene,
name::{AsName, Name},
path::Path,
FileAstId, HirFileId, ModuleSource, Source,
attr::Attr, db::DefDatabase2, hygiene::Hygiene, path::Path, FileAstId, HirFileId, ModuleSource,
Source,
};
/// `RawItems` is a set of top-level items in a file (except for impls).

View file

@ -2,19 +2,17 @@
use std::{iter, sync::Arc};
use hir_expand::either::Either;
use hir_expand::{
either::Either,
name::{self, AsName, Name},
};
use ra_db::CrateId;
use ra_syntax::{
ast::{self, NameOwner, TypeAscriptionOwner},
AstNode,
};
use crate::{
hygiene::Hygiene,
name::{self, AsName, Name},
type_ref::TypeRef,
Source,
};
use crate::{hygiene::Hygiene, type_ref::TypeRef, Source};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Path {
@ -392,8 +390,9 @@ fn convert_path(prefix: Option<Path>, path: ast::Path, hygiene: &Hygiene) -> Opt
}
pub mod known {
use hir_expand::name;
use super::{Path, PathKind};
use crate::name;
pub fn std_iter_into_iterator() -> Path {
Path::from_simple_segments(

View file

@ -7,6 +7,7 @@
pub mod db;
pub mod ast_id_map;
pub mod either;
pub mod name;
use std::hash::{Hash, Hasher};