diff options
| author | Seivan Heidari <[email protected]> | 2019-11-07 17:44:59 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-07 17:44:59 +0000 |
| commit | 915460544ae1d830e227f4c07e02d11d5e0f6a78 (patch) | |
| tree | 6f6f709b0931ef0ff491c78c0b2b06c254c63ab0 /crates/ra_hir/src/lib.rs | |
| parent | cae45677fa9a32e4933c747bc3eb8b438f8f8a0a (diff) | |
| parent | 2a8d48d8a9a83c46ca60bdf6e49a4690383b236a (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
| -rw-r--r-- | crates/ra_hir/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 5f2a05e76..131f6c797 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
| @@ -61,6 +61,7 @@ use crate::{ids::MacroFileKind, resolve::Resolver}; | |||
| 61 | pub use crate::{ | 61 | pub use crate::{ |
| 62 | adt::VariantDef, | 62 | adt::VariantDef, |
| 63 | code_model::{ | 63 | code_model::{ |
| 64 | attrs::{AttrDef, Attrs}, | ||
| 64 | docs::{DocDef, Docs, Documentation}, | 65 | docs::{DocDef, Docs, Documentation}, |
| 65 | src::{HasBodySource, HasSource}, | 66 | src::{HasBodySource, HasSource}, |
| 66 | Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum, | 67 | Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum, |