diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-05-30 14:13:06 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-05-30 14:13:06 +0100 |
commit | 3cf841e1bc2bf354c180dc80fb394c0e0a843965 (patch) | |
tree | f01cf9c3589ae920c50696ce244c98b2454834b3 /crates/ra_hir/src/lib.rs | |
parent | 6b88735fe6cd3b259816c7c90a2675ee057c9e4c (diff) | |
parent | b6a854e161cc122e6d9ae12084b6a1d1f4d0f241 (diff) |
Merge #1352
1352: Builtins r=matklad a=matklad
closes #1340
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index cb09c60f8..3e00eea26 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -6,7 +6,7 @@ | |||
6 | //! applied. So, the relation between syntax and HIR is many-to-one. | 6 | //! applied. So, the relation between syntax and HIR is many-to-one. |
7 | 7 | ||
8 | macro_rules! impl_froms { | 8 | macro_rules! impl_froms { |
9 | ($e:ident: $($v:ident), *) => { | 9 | ($e:ident: $($v:ident),*) => { |
10 | $( | 10 | $( |
11 | impl From<$v> for $e { | 11 | impl From<$v> for $e { |
12 | fn from(it: $v) -> $e { | 12 | fn from(it: $v) -> $e { |
@@ -80,5 +80,6 @@ pub use self::code_model::{ | |||
80 | Function, FnSignature, | 80 | Function, FnSignature, |
81 | StructField, FieldSource, | 81 | StructField, FieldSource, |
82 | Static, Const, ConstSignature, | 82 | Static, Const, ConstSignature, |
83 | Trait, TypeAlias, MacroDef, Container | 83 | Trait, TypeAlias, MacroDef, Container, |
84 | BuiltinType, | ||
84 | }; | 85 | }; |