language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-18 16:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove DefKind::Function

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-24 15:31:12 +03:00
parent ec7ed054e0
commit 1754dd9fdd
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -209,7 +209,6 @@ pub struct DefLoc {
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub(crate) enum DefKind { pub(crate) enum DefKind {
Function,
Struct, Struct,
Enum, Enum,
EnumVariant, EnumVariant,
@ -239,7 +238,6 @@ impl DefId {
pub fn resolve(self, db: &impl HirDatabase) -> Def { pub fn resolve(self, db: &impl HirDatabase) -> Def {
let loc = self.loc(db); let loc = self.loc(db);
match loc.kind { match loc.kind {
DefKind::Function => unreachable!(),
DefKind::Struct => { DefKind::Struct => {
let struct_def = Struct::new(self); let struct_def = Struct::new(self);
Def::Struct(struct_def) Def::Struct(struct_def)

8
crates/ra_hir/src/impl_block.rs
View file

@ -77,7 +77,9 @@ impl ImplData {
.impl_items() .impl_items()
.map(|item_node| { .map(|item_node| {
let kind = match item_node.kind() { let kind = match item_node.kind() {
ast::ImplItemKind::FnDef(..) => DefKind::Function, ast::ImplItemKind::FnDef(it) => {
return ImplItem::Method(Function::from_ast(db, module, file_id, it));
}
ast::ImplItemKind::ConstDef(..) => DefKind::Item, ast::ImplItemKind::ConstDef(..) => DefKind::Item,
ast::ImplItemKind::TypeDef(..) => DefKind::Item, ast::ImplItemKind::TypeDef(..) => DefKind::Item,
}; };
@ -93,9 +95,7 @@ impl ImplData {
}; };
let def_id = def_loc.id(db); let def_id = def_loc.id(db);
match item_node.kind() { match item_node.kind() {
ast::ImplItemKind::FnDef(it) => { ast::ImplItemKind::FnDef(_) => unreachable!(),
ImplItem::Method(Function::from_ast(db, module, file_id, it))
}
ast::ImplItemKind::ConstDef(..) => ImplItem::Const(def_id), ast::ImplItemKind::ConstDef(..) => ImplItem::Const(def_id),
ast::ImplItemKind::TypeDef(..) => ImplItem::Type(def_id), ast::ImplItemKind::TypeDef(..) => ImplItem::Type(def_id),
} }