diff options
author | Aleksey Kladov <[email protected]> | 2019-09-12 22:31:04 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-09-12 22:31:04 +0100 |
commit | bcf30d389c3744ab517372431eb7e1e1dfcc50df (patch) | |
tree | 8b34525b463ba62d9b1acc90a790a438ba8f9ee0 /crates/ra_hir/src/code_model.rs | |
parent | 45117c63884366ee82102a782a62a09fefff746b (diff) |
generalize impl_froms to nested enums
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 026753c9f..a10e795ce 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -139,7 +139,7 @@ pub enum ModuleDef { | |||
139 | impl_froms!( | 139 | impl_froms!( |
140 | ModuleDef: Module, | 140 | ModuleDef: Module, |
141 | Function, | 141 | Function, |
142 | AdtDef, | 142 | AdtDef(Struct, Enum, Union), |
143 | EnumVariant, | 143 | EnumVariant, |
144 | Const, | 144 | Const, |
145 | Static, | 145 | Static, |
@@ -148,24 +148,6 @@ impl_froms!( | |||
148 | BuiltinType | 148 | BuiltinType |
149 | ); | 149 | ); |
150 | 150 | ||
151 | impl From<Struct> for ModuleDef { | ||
152 | fn from(it: Struct) -> ModuleDef { | ||
153 | ModuleDef::AdtDef(AdtDef::Struct(it)) | ||
154 | } | ||
155 | } | ||
156 | |||
157 | impl From<Enum> for ModuleDef { | ||
158 | fn from(it: Enum) -> ModuleDef { | ||
159 | ModuleDef::AdtDef(AdtDef::Enum(it)) | ||
160 | } | ||
161 | } | ||
162 | |||
163 | impl From<Union> for ModuleDef { | ||
164 | fn from(it: Union) -> ModuleDef { | ||
165 | ModuleDef::AdtDef(AdtDef::Union(it)) | ||
166 | } | ||
167 | } | ||
168 | |||
169 | pub enum ModuleSource { | 151 | pub enum ModuleSource { |
170 | SourceFile(ast::SourceFile), | 152 | SourceFile(ast::SourceFile), |
171 | Module(ast::Module), | 153 | Module(ast::Module), |