diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 5 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/conv.rs | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index 3ac146950..dd7eeebd0 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
@@ -62,11 +62,6 @@ impl Crate { | |||
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
65 | #[derive(Debug)] | ||
66 | pub enum Def { | ||
67 | Item, | ||
68 | } | ||
69 | |||
70 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 65 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
71 | pub struct Module { | 66 | pub struct Module { |
72 | pub(crate) krate: Crate, | 67 | pub(crate) krate: Crate, |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index a6e744ea7..ac5f33079 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -66,7 +66,6 @@ pub use self::{ | |||
66 | 66 | ||
67 | pub use self::code_model_api::{ | 67 | pub use self::code_model_api::{ |
68 | Crate, CrateDependency, | 68 | Crate, CrateDependency, |
69 | Def, | ||
70 | Module, ModuleDef, ModuleSource, Problem, | 69 | Module, ModuleDef, ModuleSource, Problem, |
71 | Struct, Enum, EnumVariant, | 70 | Struct, Enum, EnumVariant, |
72 | Function, FnSignature, | 71 | Function, FnSignature, |
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs index 41f78e58d..74e91c236 100644 --- a/crates/ra_lsp_server/src/conv.rs +++ b/crates/ra_lsp_server/src/conv.rs | |||
@@ -39,9 +39,11 @@ impl Conv for SyntaxKind { | |||
39 | SyntaxKind::FN_DEF => SymbolKind::Function, | 39 | SyntaxKind::FN_DEF => SymbolKind::Function, |
40 | SyntaxKind::STRUCT_DEF => SymbolKind::Struct, | 40 | SyntaxKind::STRUCT_DEF => SymbolKind::Struct, |
41 | SyntaxKind::ENUM_DEF => SymbolKind::Enum, | 41 | SyntaxKind::ENUM_DEF => SymbolKind::Enum, |
42 | SyntaxKind::ENUM_VARIANT => SymbolKind::EnumMember, | ||
42 | SyntaxKind::TRAIT_DEF => SymbolKind::Interface, | 43 | SyntaxKind::TRAIT_DEF => SymbolKind::Interface, |
43 | SyntaxKind::MODULE => SymbolKind::Module, | 44 | SyntaxKind::MODULE => SymbolKind::Module, |
44 | SyntaxKind::TYPE_ALIAS_DEF => SymbolKind::TypeParameter, | 45 | SyntaxKind::TYPE_ALIAS_DEF => SymbolKind::TypeParameter, |
46 | SyntaxKind::NAMED_FIELD_DEF => SymbolKind::Field, | ||
45 | SyntaxKind::STATIC_DEF => SymbolKind::Constant, | 47 | SyntaxKind::STATIC_DEF => SymbolKind::Constant, |
46 | SyntaxKind::CONST_DEF => SymbolKind::Constant, | 48 | SyntaxKind::CONST_DEF => SymbolKind::Constant, |
47 | SyntaxKind::IMPL_BLOCK => SymbolKind::Object, | 49 | SyntaxKind::IMPL_BLOCK => SymbolKind::Object, |