diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-12 22:35:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-12 22:35:28 +0100 |
commit | 1adf0519bcc8286c06e12aa7e5b16298addfea4a (patch) | |
tree | 3fe7cb05dc4d92d19ecbb87bfafc4a9ff202153e /crates/ra_hir/src/lib.rs | |
parent | d8b621cf26b59ff5ae9379b50fc822590b6a3a4e (diff) | |
parent | 114a1b878e95c20490af574550ea0825b7a8f9d1 (diff) |
Merge #1835
1835: rename AdtDef -> Adt r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 24ee84f86..508da3623 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -8,13 +8,20 @@ | |||
8 | //! applied. So, the relation between syntax and HIR is many-to-one. | 8 | //! applied. So, the relation between syntax and HIR is many-to-one. |
9 | 9 | ||
10 | macro_rules! impl_froms { | 10 | macro_rules! impl_froms { |
11 | ($e:ident: $($v:ident),*) => { | 11 | ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => { |
12 | $( | 12 | $( |
13 | impl From<$v> for $e { | 13 | impl From<$v> for $e { |
14 | fn from(it: $v) -> $e { | 14 | fn from(it: $v) -> $e { |
15 | $e::$v(it) | 15 | $e::$v(it) |
16 | } | 16 | } |
17 | } | 17 | } |
18 | $($( | ||
19 | impl From<$sv> for $e { | ||
20 | fn from(it: $sv) -> $e { | ||
21 | $e::$v($v::$sv(it)) | ||
22 | } | ||
23 | } | ||
24 | )*)? | ||
18 | )* | 25 | )* |
19 | } | 26 | } |
20 | } | 27 | } |
@@ -57,7 +64,7 @@ use crate::{ | |||
57 | }; | 64 | }; |
58 | 65 | ||
59 | pub use self::{ | 66 | pub use self::{ |
60 | adt::{AdtDef, VariantDef}, | 67 | adt::VariantDef, |
61 | either::Either, | 68 | either::Either, |
62 | expr::ExprScopes, | 69 | expr::ExprScopes, |
63 | generics::{GenericParam, GenericParams, HasGenericParams}, | 70 | generics::{GenericParam, GenericParams, HasGenericParams}, |
@@ -78,7 +85,7 @@ pub use self::{ | |||
78 | pub use self::code_model::{ | 85 | pub use self::code_model::{ |
79 | docs::{DocDef, Docs, Documentation}, | 86 | docs::{DocDef, Docs, Documentation}, |
80 | src::{HasBodySource, HasSource, Source}, | 87 | src::{HasBodySource, HasSource, Source}, |
81 | BuiltinType, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum, | 88 | Adt, BuiltinType, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum, |
82 | EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef, ModuleSource, | 89 | EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef, ModuleSource, |
83 | Static, Struct, StructField, Trait, TypeAlias, Union, | 90 | Static, Struct, StructField, Trait, TypeAlias, Union, |
84 | }; | 91 | }; |