squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #2373

Browse source 
2373: Cleanup imports r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-11-23 12:53:22 +00:00 committed by GitHub
commit cf8ac6e3c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/lib.rs
View file

@ -70,7 +70,7 @@ pub use crate::{
pub use hir_def::{
builtin_type::BuiltinType,
docs::Documentation,
nameres::{per_ns::PerNs, raw::ImportId},
nameres::raw::ImportId,
path::{Path, PathKind},
type_ref::Mutability,
};

20
crates/ra_hir_def/src/db.rs
View file

@ -17,28 +17,28 @@ use crate::{
raw::{ImportSourceMap, RawItems},
CrateDefMap,
},
AttrDefId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, ImplId, ItemLoc, ModuleId,
StaticId, StructOrUnionId, TraitId, TypeAliasId,
AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, FunctionId, FunctionLoc, GenericDefId,
ImplId, ItemLoc, ModuleId, StaticId, StructOrUnionId, TraitId, TypeAliasId, TypeAliasLoc,
};
#[salsa::query_group(InternDatabaseStorage)]
pub trait InternDatabase: SourceDatabase {
#[salsa::interned]
fn intern_function(&self, loc: crate::FunctionLoc) -> crate::FunctionId;
fn intern_function(&self, loc: FunctionLoc) -> FunctionId;
#[salsa::interned]
fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> crate::StructOrUnionId;
fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> StructOrUnionId;
#[salsa::interned]
fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> crate::EnumId;
fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> EnumId;
#[salsa::interned]
fn intern_const(&self, loc: crate::ConstLoc) -> crate::ConstId;
fn intern_const(&self, loc: ConstLoc) -> ConstId;
#[salsa::interned]
fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> crate::StaticId;
fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> StaticId;
#[salsa::interned]
fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> crate::TraitId;
fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> TraitId;
#[salsa::interned]
fn intern_type_alias(&self, loc: crate::TypeAliasLoc) -> crate::TypeAliasId;
fn intern_type_alias(&self, loc: TypeAliasLoc) -> TypeAliasId;
#[salsa::interned]
fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> crate::ImplId;
fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> ImplId;
}
#[salsa::query_group(DefDatabaseStorage)]