diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-02 19:27:02 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-02 19:27:02 +0100 |
| commit | 4613497a7714c6cd87166e6525d764d75f8acefd (patch) | |
| tree | 2527ae2c0ef2ef100efee3fcb8899f8e34d0d573 /crates/ra_hir/src/lib.rs | |
| parent | 19e28888aa41b2845b47adb7314aed99d3c48679 (diff) | |
| parent | 89e1f97515c36ab97bd378d972cabec0feb6d77e (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into fix_4202
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
| -rw-r--r-- | crates/ra_hir/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 312ef3814..c5df4ac24 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
| @@ -70,6 +70,7 @@ pub use hir_def::{ | |||
| 70 | type_ref::Mutability, | 70 | type_ref::Mutability, |
| 71 | }; | 71 | }; |
| 72 | pub use hir_expand::{ | 72 | pub use hir_expand::{ |
| 73 | name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin, | 73 | hygiene::Hygiene, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, |
| 74 | MacroFile, Origin, | ||
| 74 | }; | 75 | }; |
| 75 | pub use hir_ty::{display::HirDisplay, CallableDef}; | 76 | pub use hir_ty::{display::HirDisplay, CallableDef}; |