aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-12 14:51:02 +0000
committerGitHub <[email protected]>2019-12-12 14:51:02 +0000
commit254c8efc5b34484d503b68ecc5c8ed6802117435 (patch)
tree7f330ae43be1b96e27a051a182fff4694fb3b748
parentc213c3b36b7987504c6c3703b76a637dd0d01355 (diff)
parent8e65b773874909985b6ffc9247ea9dfbaac6a02b (diff)
Merge #2540
2540: Dedupe from_source impls r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--crates/ra_hir/src/from_source.rs111
-rw-r--r--crates/ra_hir_def/src/keys.rs2
2 files changed, 35 insertions, 78 deletions
diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs
index f7411c5cf..7abb4bd75 100644
--- a/crates/ra_hir/src/from_source.rs
+++ b/crates/ra_hir/src/from_source.rs
@@ -1,7 +1,8 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2use hir_def::{ 2use hir_def::{
3 child_by_source::ChildBySource, dyn_map::DynMap, keys, nameres::ModuleSource, EnumVariantId, 3 child_by_source::ChildBySource, dyn_map::DynMap, keys, keys::Key, nameres::ModuleSource,
4 GenericDefId, ModuleId, VariantId, 4 ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, ImplId, ModuleId, StaticId, StructId,
5 TraitId, TypeAliasId, UnionId, VariantId,
5}; 6};
6use hir_expand::{name::AsName, AstId, MacroDefId, MacroDefKind}; 7use hir_expand::{name::AsName, AstId, MacroDefId, MacroDefKind};
7use ra_syntax::{ 8use ra_syntax::{
@@ -20,81 +21,47 @@ pub trait FromSource: Sized {
20 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self>; 21 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self>;
21} 22}
22 23
23impl FromSource for Struct { 24pub trait FromSourceByContainer: Sized {
24 type Ast = ast::StructDef; 25 type Ast: AstNode + 'static;
25 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 26 type Id: Copy + 'static;
26 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::STRUCT] 27 const KEY: Key<Self::Ast, Self::Id>;
27 .get(&src)
28 .copied()
29 .map(Struct::from)
30 }
31}
32impl FromSource for Union {
33 type Ast = ast::UnionDef;
34 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
35 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::UNION]
36 .get(&src)
37 .copied()
38 .map(Union::from)
39 }
40}
41impl FromSource for Enum {
42 type Ast = ast::EnumDef;
43 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
44 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::ENUM]
45 .get(&src)
46 .copied()
47 .map(Enum::from)
48 }
49}
50impl FromSource for Trait {
51 type Ast = ast::TraitDef;
52 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
53 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::TRAIT]
54 .get(&src)
55 .copied()
56 .map(Trait::from)
57 }
58}
59impl FromSource for Function {
60 type Ast = ast::FnDef;
61 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
62 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::FUNCTION]
63 .get(&src)
64 .copied()
65 .map(Function::from)
66 }
67} 28}
68 29
69impl FromSource for Const { 30impl<T: FromSourceByContainer> FromSource for T
70 type Ast = ast::ConstDef; 31where
71 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 32 T: From<<T as FromSourceByContainer>::Id>,
72 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::CONST] 33{
73 .get(&src) 34 type Ast = <T as FromSourceByContainer>::Ast;
74 .copied()
75 .map(Const::from)
76 }
77}
78impl FromSource for Static {
79 type Ast = ast::StaticDef;
80 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 35 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
81 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::STATIC] 36 analyze_container(db, src.as_ref().map(|it| it.syntax()))[T::KEY]
82 .get(&src) 37 .get(&src)
83 .copied() 38 .copied()
84 .map(Static::from) 39 .map(Self::from)
85 } 40 }
86} 41}
87 42
88impl FromSource for TypeAlias { 43macro_rules! from_source_by_container_impls {
89 type Ast = ast::TypeAliasDef; 44 ($(($hir:ident, $id:ident, $ast:path, $key:path)),* ,) => {$(
90 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 45 impl FromSourceByContainer for $hir {
91 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::TYPE_ALIAS] 46 type Ast = $ast;
92 .get(&src) 47 type Id = $id;
93 .copied() 48 const KEY: Key<Self::Ast, Self::Id> = $key;
94 .map(TypeAlias::from) 49 }
95 } 50 )*}
96} 51}
97 52
53from_source_by_container_impls![
54 (Struct, StructId, ast::StructDef, keys::STRUCT),
55 (Union, UnionId, ast::UnionDef, keys::UNION),
56 (Enum, EnumId, ast::EnumDef, keys::ENUM),
57 (Trait, TraitId, ast::TraitDef, keys::TRAIT),
58 (Function, FunctionId, ast::FnDef, keys::FUNCTION),
59 (Static, StaticId, ast::StaticDef, keys::STATIC),
60 (Const, ConstId, ast::ConstDef, keys::CONST),
61 (TypeAlias, TypeAliasId, ast::TypeAliasDef, keys::TYPE_ALIAS),
62 (ImplBlock, ImplId, ast::ImplBlock, keys::IMPL),
63];
64
98impl FromSource for MacroDef { 65impl FromSource for MacroDef {
99 type Ast = ast::MacroCall; 66 type Ast = ast::MacroCall;
100 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 67 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
@@ -111,16 +78,6 @@ impl FromSource for MacroDef {
111 } 78 }
112} 79}
113 80
114impl FromSource for ImplBlock {
115 type Ast = ast::ImplBlock;
116 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
117 analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::IMPL]
118 .get(&src)
119 .copied()
120 .map(ImplBlock::from)
121 }
122}
123
124impl FromSource for EnumVariant { 81impl FromSource for EnumVariant {
125 type Ast = ast::EnumVariant; 82 type Ast = ast::EnumVariant;
126 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { 83 fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs
index 4611c6e38..d844f7a62 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/ra_hir_def/src/keys.rs
@@ -12,7 +12,7 @@ use crate::{
12 TypeAliasId, TypeParamId, UnionId, 12 TypeAliasId, TypeParamId, UnionId,
13}; 13};
14 14
15type Key<K, V> = crate::dyn_map::Key<InFile<K>, V, AstPtrPolicy<K, V>>; 15pub type Key<K, V> = crate::dyn_map::Key<InFile<K>, V, AstPtrPolicy<K, V>>;
16 16
17pub const FUNCTION: Key<ast::FnDef, FunctionId> = Key::new(); 17pub const FUNCTION: Key<ast::FnDef, FunctionId> = Key::new();
18pub const CONST: Key<ast::ConstDef, ConstId> = Key::new(); 18pub const CONST: Key<ast::ConstDef, ConstId> = Key::new();